]> granicus.if.org Git - strace/blobdiff - mem.c
Fix preadv/pwritev offset decoding
[strace] / mem.c
diff --git a/mem.c b/mem.c
index 49e3a1c03db63b21de6714624457a8a765c5dd70..ce5ce51e5f2ad698e2c130c77b0230096b5444de 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;
+static unsigned long
+get_pagesize()
 {
-       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;
 }
 
-#if defined(FREEBSD) || defined(SUNOS4)
 int
-sys_sbrk(tcp)
-struct tcb *tcp;
+sys_brk(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%lu", tcp->u_arg[0]);
+               tprintf("%#lx", tcp->u_arg[0]);
        }
        return RVAL_HEX;
 }
-#endif /* FREEBSD || SUNOS4 */
 
 static const struct xlat mmap_prot[] = {
-       { PROT_NONE,    "PROT_NONE",    },
-       { PROT_READ,    "PROT_READ"     },
-       { PROT_WRITE,   "PROT_WRITE"    },
-       { PROT_EXEC,    "PROT_EXEC"     },
+       XLAT(PROT_NONE),
+       XLAT(PROT_READ),
+       XLAT(PROT_WRITE),
+       XLAT(PROT_EXEC),
 #ifdef PROT_SEM
-       { PROT_SEM,     "PROT_SEM"      },
+       XLAT(PROT_SEM),
 #endif
 #ifdef PROT_GROWSDOWN
-       { PROT_GROWSDOWN,"PROT_GROWSDOWN"},
+       XLAT(PROT_GROWSDOWN),
 #endif
 #ifdef PROT_GROWSUP
-       { PROT_GROWSUP, "PROT_GROWSUP"  },
+       XLAT(PROT_GROWSUP),
 #endif
 #ifdef PROT_SAO
-       { PROT_SAO,     "PROT_SAO"      },
+       XLAT(PROT_SAO),
 #endif
-       { 0,            NULL            },
+       XLAT_END
 };
 
 static const struct xlat mmap_flags[] = {
-       { MAP_SHARED,   "MAP_SHARED"    },
-       { MAP_PRIVATE,  "MAP_PRIVATE"   },
-       { MAP_FIXED,    "MAP_FIXED"     },
+       XLAT(MAP_SHARED),
+       XLAT(MAP_PRIVATE),
+       XLAT(MAP_FIXED),
 #ifdef MAP_ANONYMOUS
-       { MAP_ANONYMOUS,"MAP_ANONYMOUS" },
+       XLAT(MAP_ANONYMOUS),
 #endif
 #ifdef MAP_32BIT
-       { MAP_32BIT,    "MAP_32BIT"     },
+       XLAT(MAP_32BIT),
 #endif
 #ifdef MAP_RENAME
-       { MAP_RENAME,   "MAP_RENAME"    },
+       XLAT(MAP_RENAME),
 #endif
 #ifdef MAP_NORESERVE
-       { MAP_NORESERVE,"MAP_NORESERVE" },
+       XLAT(MAP_NORESERVE),
 #endif
 #ifdef MAP_POPULATE
-       { MAP_POPULATE, "MAP_POPULATE" },
+       XLAT(MAP_POPULATE),
 #endif
 #ifdef MAP_NONBLOCK
-       { MAP_NONBLOCK, "MAP_NONBLOCK" },
+       XLAT(MAP_NONBLOCK),
 #endif
        /*
         * XXX - this was introduced in SunOS 4.x to distinguish between
@@ -152,64 +123,65 @@ static const struct xlat mmap_flags[] = {
         * and calls with it as "mmap()".
         */
 #ifdef _MAP_NEW
-       { _MAP_NEW,     "_MAP_NEW"      },
+       XLAT(_MAP_NEW),
 #endif
 #ifdef MAP_GROWSDOWN
-       { MAP_GROWSDOWN,"MAP_GROWSDOWN" },
+       XLAT(MAP_GROWSDOWN),
 #endif
 #ifdef MAP_DENYWRITE
-       { MAP_DENYWRITE,"MAP_DENYWRITE" },
+       XLAT(MAP_DENYWRITE),
 #endif
 #ifdef MAP_EXECUTABLE
-       { MAP_EXECUTABLE,"MAP_EXECUTABLE"},
+       XLAT(MAP_EXECUTABLE),
 #endif
 #ifdef MAP_INHERIT
-       { MAP_INHERIT,"MAP_INHERIT"     },
+       XLAT(MAP_INHERIT),
 #endif
 #ifdef MAP_FILE
-       { MAP_FILE,"MAP_FILE"},
+       XLAT(MAP_FILE),
 #endif
 #ifdef MAP_LOCKED
-       { MAP_LOCKED,"MAP_LOCKED"},
+       XLAT(MAP_LOCKED),
 #endif
        /* FreeBSD ones */
-#ifdef MAP_ANON
-       { MAP_ANON,             "MAP_ANON"      },
+#if defined(MAP_ANON) && (!defined(MAP_ANONYMOUS) || MAP_ANON != MAP_ANONYMOUS)
+       XLAT(MAP_ANON),
 #endif
 #ifdef MAP_HASSEMAPHORE
-       { MAP_HASSEMAPHORE,     "MAP_HASSEMAPHORE"      },
+       XLAT(MAP_HASSEMAPHORE),
 #endif
 #ifdef MAP_STACK
-       { MAP_STACK,            "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
-       { MAP_NOSYNC,           "MAP_NOSYNC"    },
+       XLAT(MAP_NOSYNC),
 #endif
 #ifdef MAP_NOCORE
-       { MAP_NOCORE,           "MAP_NOCORE"    },
+       XLAT(MAP_NOCORE),
 #endif
-       { 0,            NULL            },
+       XLAT_END
 };
 
-#if !HAVE_LONG_LONG_OFF_T
-static
-int
-print_mmap(tcp,u_arg, offset)
-struct tcb *tcp;
-long *u_arg;
-long long offset;
+static int
+print_mmap(struct tcb *tcp, long *u_arg, unsigned long long offset)
 {
        if (entering(tcp)) {
                /* addr */
                if (!u_arg[0])
-                       tprintf("NULL, ");
+                       tprints("NULL, ");
                else
                        tprintf("%#lx, ", u_arg[0]);
                /* len */
                tprintf("%lu, ", u_arg[1]);
                /* prot */
                printflags(mmap_prot, u_arg[2], "PROT_???");
-               tprintf(", ");
+               tprints(", ");
                /* flags */
 #ifdef MAP_TYPE
                printxval(mmap_flags, u_arg[3] & MAP_TYPE, "MAP_???");
@@ -217,135 +189,113 @@ long long offset;
 #else
                printflags(mmap_flags, u_arg[3], "MAP_???");
 #endif
-               /* fd (is always int, not long) */
-               tprintf(", %d, ", (int)u_arg[4]);
+               tprints(", ");
+               /* fd */
+               printfd(tcp, u_arg[4]);
                /* offset */
-               tprintf("%#llx", offset);
+               tprintf("%#llx", offset);
        }
        return RVAL_HEX;
 }
 
-#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 */
+int
+sys_old_mmap(struct tcb *tcp)
 {
        long u_arg[6];
-
-#if    defined(IA64)
-       int i, v;
+#if defined(IA64)
        /*
-        *  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.
+        * 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), (char *) narrow_arg) == -1)
+               return 0;
        for (i = 0; i < 6; i++)
-               if (umove(tcp, tcp->u_arg[0] + (i * sizeof(int)), &v) == -1)
-                       return 0;
-               else
-                       u_arg[i] = v;
-#elif defined(SH) || defined(SH64)
-       /* SH has always passed the args in registers */
+               u_arg[i] = (unsigned long) narrow_arg[i];
+#elif defined(X86_64)
+       /* We are here only in personality 1 (i386) */
        int i;
-       for (i=0; i<6; i++)
-               u_arg[i] = tcp->u_arg[i];
+       unsigned narrow_arg[6];
+       if (umoven(tcp, tcp->u_arg[0], sizeof(narrow_arg), (char *) narrow_arg) == -1)
+               return 0;
+       for (i = 0; i < 6; ++i)
+               u_arg[i] = (unsigned long) narrow_arg[i];
 #else
-# if defined(X86_64)
-       if (current_personality == 1) {
-               int i;
-               for (i = 0; i < 6; ++i) {
-                       unsigned int val;
-                       if (umove(tcp, tcp->u_arg[0] + i * 4, &val) == -1)
-                               return 0;
-                       u_arg[i] = val;
-               }
-       }
-       else
-# endif
-       if (umoven(tcp, tcp->u_arg[0], sizeof u_arg, (char *) u_arg) == -1)
+       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, u_arg[5]);
-}
 #endif
+       return print_mmap(tcp, u_arg, (unsigned long) u_arg[5]);
+}
 
+#if defined(S390)
+/* Params are pointed to by u_arg[0], offset is in pages */
 int
-sys_mmap(tcp)
-struct tcb *tcp;
+sys_old_mmap_pgoff(struct tcb *tcp)
 {
-       long long offset = tcp->u_arg[5];
-
-#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.
-        */
-       offset <<= PAGE_SHIFT;
+       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)
+               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);
+}
 #endif
-#if defined(LINUX_MIPSN32)
+
+/* Params are passed directly, offset is in bytes */
+int
+sys_mmap(struct tcb *tcp)
+{
+       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.
+        */
        return print_mmap(tcp, tcp->u_arg, offset);
 }
-#endif /* !HAVE_LONG_LONG_OFF_T */
 
-#if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
+/* Params are passed directly, offset is in pages */
 int
-sys_mmap64(tcp)
-struct tcb *tcp;
+sys_mmap_pgoff(struct tcb *tcp)
 {
-#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 */
-
-       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 */
-
-               /* 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 */
-               printllval(tcp, "%#llx", 5);
-       }
-       return RVAL_HEX;
+       /* 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);
 }
-#endif
 
+/* Params are passed directly, offset is in 4k units */
+int
+sys_mmap_4koff(struct tcb *tcp)
+{
+       unsigned long long offset;
+       offset = (unsigned long) tcp->u_arg[5];
+       offset <<= 12;
+       return print_mmap(tcp, tcp->u_arg, offset);
+}
 
 int
-sys_munmap(tcp)
-struct tcb *tcp;
+sys_munmap(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%#lx, %lu",
@@ -355,8 +305,7 @@ struct tcb *tcp;
 }
 
 int
-sys_mprotect(tcp)
-struct tcb *tcp;
+sys_mprotect(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%#lx, %lu, ",
@@ -366,14 +315,12 @@ struct tcb *tcp;
        return 0;
 }
 
-#ifdef LINUX
-
 static const struct xlat mremap_flags[] = {
-       { MREMAP_MAYMOVE,       "MREMAP_MAYMOVE"        },
+       XLAT(MREMAP_MAYMOVE),
 #ifdef MREMAP_FIXED
-       { MREMAP_FIXED,         "MREMAP_FIXED"          },
+       XLAT(MREMAP_FIXED),
 #endif
-       { 0,                    NULL                    }
+       XLAT_END
 };
 
 int
@@ -394,27 +341,58 @@ sys_mremap(struct tcb *tcp)
 
 static const struct xlat madvise_cmds[] = {
 #ifdef MADV_NORMAL
-       { MADV_NORMAL,          "MADV_NORMAL" },
+       XLAT(MADV_NORMAL),
 #endif
 #ifdef MADV_RANDOM
-       { MADV_RANDOM,          "MADV_RANDOM" },
+       XLAT(MADV_RANDOM),
 #endif
 #ifdef MADV_SEQUENTIAL
-       { MADV_SEQUENTIAL,      "MADV_SEQUENTIAL" },
+       XLAT(MADV_SEQUENTIAL),
 #endif
 #ifdef MADV_WILLNEED
-       { MADV_WILLNEED,        "MADV_WILLNEED" },
+       XLAT(MADV_WILLNEED),
 #endif
 #ifdef MADV_DONTNEED
-       { MADV_DONTNEED,        "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
-       { 0,                    NULL },
+#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
 };
 
-
 int
-sys_madvise(tcp)
-struct tcb *tcp;
+sys_madvise(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
@@ -423,20 +401,18 @@ struct tcb *tcp;
        return 0;
 }
 
-
 static const struct xlat mlockall_flags[] = {
 #ifdef MCL_CURRENT
-       { MCL_CURRENT,  "MCL_CURRENT" },
+       XLAT(MCL_CURRENT),
 #endif
 #ifdef MCL_FUTURE
-       { MCL_FUTURE,   "MCL_FUTURE" },
+       XLAT(MCL_FUTURE),
 #endif
-       { 0,            NULL}
+       XLAT_END
 };
 
 int
-sys_mlockall(tcp)
-struct tcb *tcp;
+sys_mlockall(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printflags(mlockall_flags, tcp->u_arg[0], "MCL_???");
@@ -444,23 +420,19 @@ struct tcb *tcp;
        return 0;
 }
 
-
-#endif /* LINUX */
-
 #ifdef MS_ASYNC
 
 static const struct xlat mctl_sync[] = {
 #ifdef MS_SYNC
-       { MS_SYNC,      "MS_SYNC"       },
+       XLAT(MS_SYNC),
 #endif
-       { MS_ASYNC,     "MS_ASYNC"      },
-       { MS_INVALIDATE,"MS_INVALIDATE" },
-       { 0,            NULL            },
+       XLAT(MS_ASYNC),
+       XLAT(MS_INVALIDATE),
+       XLAT_END
 };
 
 int
-sys_msync(tcp)
-struct tcb *tcp;
+sys_msync(struct tcb *tcp)
 {
        if (entering(tcp)) {
                /* addr */
@@ -478,23 +450,22 @@ struct tcb *tcp;
 #ifdef MC_SYNC
 
 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            },
+       XLAT(MC_LOCK),
+       XLAT(MC_LOCKAS),
+       XLAT(MC_SYNC),
+       XLAT(MC_UNLOCK),
+       XLAT(MC_UNLOCKAS),
+       XLAT_END
 };
 
 static const struct xlat mctl_lockas[] = {
-       { MCL_CURRENT,  "MCL_CURRENT"   },
-       { MCL_FUTURE,   "MCL_FUTURE"    },
-       { 0,            NULL            },
+       XLAT(MCL_CURRENT),
+       XLAT(MCL_FUTURE),
+       XLAT_END
 };
 
 int
-sys_mctl(tcp)
-struct tcb *tcp;
+sys_mctl(struct tcb *tcp)
 {
        int arg, function;
 
@@ -508,7 +479,7 @@ struct tcb *tcp;
                printflags(mctl_funcs, function, "MC_???");
                /* arg */
                arg = tcp->u_arg[3];
-               tprintf(", ");
+               tprints(", ");
                switch (function) {
                case MC_SYNC:
                        printflags(mctl_sync, arg, "MS_???");
@@ -527,149 +498,47 @@ struct tcb *tcp;
 #endif /* MC_SYNC */
 
 int
-sys_mincore(tcp)
-struct tcb *tcp;
+sys_mincore(struct tcb *tcp)
 {
-       unsigned long i, len;
-       char *vec = NULL;
-
        if (entering(tcp)) {
                tprintf("%#lx, %lu, ", tcp->u_arg[0], 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]);
                else {
-                       tprintf("[");
+                       tprints("[");
                        for (i = 0; i < len; i++) {
                                if (abbrev(tcp) && i >= max_strlen) {
-                                       tprintf("...");
+                                       tprints("...");
                                        break;
                                }
-                               tprintf((vec[i] & 1) ? "1" : "0");
+                               tprints((vec[i] & 1) ? "1" : "0");
                        }
-                       tprintf("]");
+                       tprints("]");
                }
-               if (vec)
-                       free(vec);
+               free(vec);
        }
        return 0;
 }
 
-#if defined(ALPHA) || defined(FREEBSD) || defined(IA64) || defined(SUNOS4) || defined(SVR4) || defined(SPARC) || defined(SPARC64)
+#if defined(ALPHA) || defined(IA64) || defined(SPARC) || defined(SPARC64)
 int
-sys_getpagesize(tcp)
-struct tcb *tcp;
+sys_getpagesize(struct tcb *tcp)
 {
        if (exiting(tcp))
                return RVAL_HEX;
        return 0;
 }
-#endif /* ALPHA || FREEBSD || IA64 || SUNOS4 || SVR4 */
-
-#if defined(LINUX) && defined(__i386__)
-void
-print_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}",
-               (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(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);
-                       }
-               } else {
-                       tprintf("%lx", tcp->u_arg[0]);
-               }
-       }
-       return 0;
-
-}
-
-int
-sys_get_thread_area(tcp)
-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))
-                               tprintf("...}");
-                       else {
-                               print_ldt_entry(&copy);
-                       }
-               } else {
-                       tprintf("%lx", tcp->u_arg[0]);
-               }
-       }
-       return 0;
-
-}
-#endif /* LINUX && __i386__ */
+#endif
 
-#if defined(LINUX)
 int
-sys_remap_file_pages(tcp)
-struct tcb *tcp;
+sys_remap_file_pages(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
@@ -685,7 +554,6 @@ struct tcb *tcp;
        return 0;
 }
 
-
 #define MPOL_DEFAULT    0
 #define MPOL_PREFERRED  1
 #define MPOL_BIND       2
@@ -698,41 +566,35 @@ struct tcb *tcp;
 #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                    }
+       XLAT(MPOL_DEFAULT),
+       XLAT(MPOL_PREFERRED),
+       XLAT(MPOL_BIND),
+       XLAT(MPOL_INTERLEAVE),
+       XLAT_END
 };
 
 static const struct xlat mbindflags[] = {
-       { MPOL_MF_STRICT,       "MPOL_MF_STRICT"        },
-       { MPOL_MF_MOVE,         "MPOL_MF_MOVE"          },
-       { MPOL_MF_MOVE_ALL,     "MPOL_MF_MOVE_ALL"      },
-       { 0,                    NULL                    }
+       XLAT(MPOL_MF_STRICT),
+       XLAT(MPOL_MF_MOVE),
+       XLAT(MPOL_MF_MOVE_ALL),
+       XLAT_END
 };
 
 static const struct xlat mempolicyflags[] = {
-       { MPOL_F_NODE,          "MPOL_F_NODE"           },
-       { MPOL_F_ADDR,          "MPOL_F_ADDR"           },
-       { 0,                    NULL                    }
+       XLAT(MPOL_F_NODE),
+       XLAT(MPOL_F_ADDR),
+       XLAT_END
 };
 
 static const struct xlat move_pages_flags[] = {
-       { MPOL_MF_MOVE,         "MPOL_MF_MOVE"          },
-       { MPOL_MF_MOVE_ALL,     "MPOL_MF_MOVE_ALL"      },
-       { 0,                    NULL                    }
+       XLAT(MPOL_MF_MOVE),
+       XLAT(MPOL_MF_MOVE_ALL),
+       XLAT_END
 };
 
-
 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)
 {
        unsigned long nlongs, size, end;
 
@@ -751,22 +613,22 @@ int err;
                } else {
                        abbrev_end = end;
                }
-               tprintf(", {");
+               tprints(", {");
                for (cur = ptr; cur < end; cur += sizeof(long)) {
                        if (cur > ptr)
-                               tprintf(", ");
+                               tprints(", ");
                        if (cur >= abbrev_end) {
-                               tprintf("...");
+                               tprints("...");
                                break;
                        }
                        if (umoven(tcp, cur, sizeof(n), (char *) &n) < 0) {
-                               tprintf("?");
+                               tprints("?");
                                failed = 1;
                                break;
                        }
                        tprintf("%#0*lx", (int) sizeof(long) * 2 + 2, n);
                }
-               tprintf("}");
+               tprints("}");
                if (failed)
                        tprintf(" %#lx", ptr);
        } else
@@ -775,22 +637,20 @@ int err;
 }
 
 int
-sys_mbind(tcp)
-struct tcb *tcp;
+sys_mbind(struct tcb *tcp)
 {
        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);
-               tprintf(", ");
+               tprints(", ");
                printflags(mbindflags, tcp->u_arg[5], "MPOL_???");
        }
        return 0;
 }
 
 int
-sys_set_mempolicy(tcp)
-struct tcb *tcp;
+sys_set_mempolicy(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printxval(policies, tcp->u_arg[0], "MPOL_???");
@@ -800,13 +660,12 @@ struct tcb *tcp;
 }
 
 int
-sys_get_mempolicy(tcp)
-struct tcb *tcp;
+sys_get_mempolicy(struct tcb *tcp)
 {
        if (exiting(tcp)) {
                int pol;
                if (tcp->u_arg[0] == 0)
-                       tprintf("NULL");
+                       tprints("NULL");
                else if (syserror(tcp) || umove(tcp, tcp->u_arg[0], &pol) < 0)
                        tprintf("%#lx", tcp->u_arg[0]);
                else
@@ -819,82 +678,91 @@ struct tcb *tcp;
 }
 
 int
-sys_move_pages(tcp)
-struct tcb *tcp;
+sys_migrate_pages(struct tcb *tcp)
+{
+       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;
+}
+
+int
+sys_move_pages(struct tcb *tcp)
 {
        if (entering(tcp)) {
                unsigned long npages = tcp->u_arg[1];
                tprintf("%ld, %lu, ", tcp->u_arg[0], npages);
                if (tcp->u_arg[2] == 0)
-                       tprintf("NULL, ");
+                       tprints("NULL, ");
                else {
                        int i;
                        long puser = tcp->u_arg[2];
-                       tprintf("{");
+                       tprints("{");
                        for (i = 0; i < npages; ++i) {
                                void *p;
                                if (i > 0)
-                                       tprintf(", ");
+                                       tprints(", ");
                                if (umove(tcp, puser, &p) < 0) {
-                                       tprintf("???");
+                                       tprints("???");
                                        break;
                                }
                                tprintf("%p", p);
-                               puser += sizeof (void *);
+                               puser += sizeof(void *);
                        }
-                       tprintf("}, ");
+                       tprints("}, ");
                }
                if (tcp->u_arg[3] == 0)
-                       tprintf("NULL, ");
+                       tprints("NULL, ");
                else {
                        int i;
                        long nodeuser = tcp->u_arg[3];
-                       tprintf("{");
+                       tprints("{");
                        for (i = 0; i < npages; ++i) {
                                int node;
                                if (i > 0)
-                                       tprintf(", ");
+                                       tprints(", ");
                                if (umove(tcp, nodeuser, &node) < 0) {
-                                       tprintf("???");
+                                       tprints("???");
                                        break;
                                }
                                tprintf("%#x", node);
-                               nodeuser += sizeof (int);
+                               nodeuser += sizeof(int);
                        }
-                       tprintf("}, ");
+                       tprints("}, ");
                }
        }
        if (exiting(tcp)) {
                unsigned long npages = tcp->u_arg[1];
                if (tcp->u_arg[4] == 0)
-                       tprintf("NULL, ");
+                       tprints("NULL, ");
                else {
                        int i;
                        long statususer = tcp->u_arg[4];
-                       tprintf("{");
+                       tprints("{");
                        for (i = 0; i < npages; ++i) {
                                int status;
                                if (i > 0)
-                                       tprintf(", ");
+                                       tprints(", ");
                                if (umove(tcp, statususer, &status) < 0) {
-                                       tprintf("???");
+                                       tprints("???");
                                        break;
                                }
                                tprintf("%#x", status);
-                               statususer += sizeof (int);
+                               statususer += sizeof(int);
                        }
-                       tprintf("}, ");
+                       tprints("}, ");
                }
                printflags(move_pages_flags, tcp->u_arg[5], "MPOL_???");
        }
        return 0;
 }
-#endif
 
-#if defined(LINUX) && defined(POWERPC)
+#if defined(POWERPC)
 int
-sys_subpage_prot(tcp)
-struct tcb *tcp;
+sys_subpage_prot(struct tcb *tcp)
 {
        if (entering(tcp)) {
                unsigned long cur, end, abbrev_end, entries;
@@ -903,7 +771,7 @@ struct tcb *tcp;
                tprintf("%#lx, %#lx, ", tcp->u_arg[0], tcp->u_arg[1]);
                entries = tcp->u_arg[1] >> 16;
                if (!entries || !tcp->u_arg[2]) {
-                       tprintf("{}");
+                       tprints("{}");
                        return 0;
                }
                cur = tcp->u_arg[2];
@@ -919,12 +787,12 @@ struct tcb *tcp;
                }
                else
                        abbrev_end = end;
-               tprintf("{");
+               tprints("{");
                for (; cur < end; cur += sizeof(int)) {
                        if (cur > tcp->u_arg[2])
-                               tprintf(", ");
+                               tprints(", ");
                        if (cur >= abbrev_end) {
-                               tprintf("...");
+                               tprints("...");
                                break;
                        }
                        if (umove(tcp, cur, &entry) < 0) {
@@ -934,7 +802,7 @@ struct tcb *tcp;
                        else
                                tprintf("%#08x", entry);
                }
-               tprintf("}");
+               tprints("}");
        }
 
        return 0;