]> 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 389e098c52fd207304b677a40e81ce9f40595113..ce5ce51e5f2ad698e2c130c77b0230096b5444de 100644 (file)
--- a/mem.c
+++ b/mem.c
 #include "defs.h"
 #include <asm/mman.h>
 #include <sys/mman.h>
-#if defined(I386)
-# include <asm/ldt.h>
-# ifdef HAVE_STRUCT_USER_DESC
-#  define modify_ldt_ldt_s user_desc
-# endif
-#endif
-#if defined(SH64)
-# include <asm/page.h>     /* for PAGE_SHIFT */
-#endif
+
+static unsigned long
+get_pagesize()
+{
+       static unsigned long pagesize;
+
+       if (!pagesize)
+               pagesize = sysconf(_SC_PAGESIZE);
+       return pagesize;
+}
 
 int
 sys_brk(struct tcb *tcp)
@@ -53,46 +54,46 @@ sys_brk(struct tcb *tcp)
 }
 
 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
@@ -122,87 +123,51 @@ 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 */
 #if defined(MAP_ANON) && (!defined(MAP_ANONYMOUS) || MAP_ANON != MAP_ANONYMOUS)
-       { MAP_ANON,     "MAP_ANON"      },
+       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
-       { MAP_UNINITIALIZED,"MAP_UNINITIALIZED"},
+       XLAT(MAP_UNINITIALIZED),
 #endif
 #ifdef MAP_NOSYNC
-       { MAP_NOSYNC,   "MAP_NOSYNC"    },
+       XLAT(MAP_NOSYNC),
 #endif
 #ifdef MAP_NOCORE
-       { MAP_NOCORE,   "MAP_NOCORE"    },
-#endif
-#ifdef TILE
-       { MAP_CACHE_NO_LOCAL, "MAP_CACHE_NO_LOCAL" },
-       { MAP_CACHE_NO_L2, "MAP_CACHE_NO_L2" },
-       { MAP_CACHE_NO_L1, "MAP_CACHE_NO_L1" },
+       XLAT(MAP_NOCORE),
 #endif
-       { 0,            NULL            },
+       XLAT_END
 };
 
-#ifdef TILE
-static int
-addtileflags(long flags)
-{
-       long home = flags & _MAP_CACHE_MKHOME(_MAP_CACHE_HOME_MASK);
-       flags &= ~_MAP_CACHE_MKHOME(_MAP_CACHE_HOME_MASK);
-
-       if (flags & _MAP_CACHE_INCOHERENT) {
-               flags &= ~_MAP_CACHE_INCOHERENT;
-               if (home == MAP_CACHE_HOME_NONE) {
-                       tprints("|MAP_CACHE_INCOHERENT");
-                       return flags;
-               }
-               tprints("|_MAP_CACHE_INCOHERENT");
-       }
-
-       switch (home) {
-       case 0: break;
-       case MAP_CACHE_HOME_HERE: tprints("|MAP_CACHE_HOME_HERE"); break;
-       case MAP_CACHE_HOME_NONE: tprints("|MAP_CACHE_HOME_NONE"); break;
-       case MAP_CACHE_HOME_SINGLE: tprints("|MAP_CACHE_HOME_SINGLE"); break;
-       case MAP_CACHE_HOME_TASK: tprints("|MAP_CACHE_HOME_TASK"); break;
-       case MAP_CACHE_HOME_HASH: tprints("|MAP_CACHE_HOME_HASH"); break;
-       default:
-               tprintf("|MAP_CACHE_HOME(%ld)",
-                       (home >> _MAP_CACHE_HOME_SHIFT) );
-               break;
-       }
-
-       return flags;
-}
-#endif
-
-#if !HAVE_LONG_LONG_OFF_T
 static int
 print_mmap(struct tcb *tcp, long *u_arg, unsigned long long offset)
 {
@@ -220,11 +185,7 @@ print_mmap(struct tcb *tcp, long *u_arg, unsigned long long offset)
                /* flags */
 #ifdef MAP_TYPE
                printxval(mmap_flags, u_arg[3] & MAP_TYPE, "MAP_???");
-# ifdef TILE
-               addflags(mmap_flags, addtileflags(u_arg[3] & ~MAP_TYPE));
-# else
                addflags(mmap_flags, u_arg[3] & ~MAP_TYPE);
-# endif
 #else
                printflags(mmap_flags, u_arg[3], "MAP_???");
 #endif
@@ -237,129 +198,101 @@ print_mmap(struct tcb *tcp, long *u_arg, unsigned long long offset)
        return RVAL_HEX;
 }
 
-int sys_old_mmap(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)
        /*
         * IA64 processes never call this routine, they only use the
-        * new `sys_mmap' interface.
-        * For IA32 processes, this code converts the integer arguments
-        * that they pushed onto the stack, into longs.
+        * new 'sys_mmap' interface. Only IA32 processes come here.
         */
        int i;
-       long u_arg[6];
        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] = narrow_arg[i];
-#elif defined(SH) || defined(SH64)
-       /* SH has always passed the args in registers */
-       long *u_arg = tcp->u_arg;
+               u_arg[i] = (unsigned long) narrow_arg[i];
 #elif defined(X86_64)
-       long u_arg[6];
-       if (current_personality == 1) {
-               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)
-                       u_arg[i] = narrow_arg[i];
-       } else {
-               if (umoven(tcp, tcp->u_arg[0], sizeof(u_arg), (char *) u_arg) == -1)
-                       return 0;
-       }
+       /* 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)
+               return 0;
+       for (i = 0; i < 6; ++i)
+               u_arg[i] = (unsigned long) narrow_arg[i];
 #else
-       long u_arg[6];
        if (umoven(tcp, tcp->u_arg[0], sizeof(u_arg), (char *) u_arg) == -1)
                return 0;
 #endif
-       return print_mmap(tcp, u_arg, (unsigned long)u_arg[5]);
+       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_old_mmap_pgoff(struct tcb *tcp)
+{
+       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
 
+/* 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(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;
-#elif defined(I386)
-       /* Try test/mmap_offset_decode.c */
-       offset <<= 12; /* 4096 byte pages */
-#elif defined(LINUX_MIPSN32) || defined(X32)
+#if defined(LINUX_MIPSN32) || defined(X32)
        /* Try test/x32_mmap.c */
-       /* At least for X32 it definitely should not be page-shifted! */
        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
-/* TODO: comment which arches use this routine.
- * For one, does ALPHA on Linux use this??
- * From code it seems that it might use 7 or 8 registers,
- * which is strange - Linux syscalls can pass maximum of 6 parameters!
- */
-# ifdef HAVE_LONG_LONG_OFF_T
-/* For systems that have a long long off_t,
- * sys_mmap in syscall tables is handled by sys_mmap64:
- */
-#  define sys_mmap64 sys_mmap
-# endif
+/* Params are passed directly, offset is in pages */
 int
-sys_mmap64(struct tcb *tcp)
+sys_mmap_pgoff(struct tcb *tcp)
 {
-       if (entering(tcp)) {
-#if defined(ALPHA) || defined(X32)
-               long *u_arg = tcp->u_arg;
-#else
-               long u_arg[7];
-               if (umoven(tcp, tcp->u_arg[0], sizeof u_arg,
-                               (char *) u_arg) == -1)
-                       return 0;
-#endif
-               /* 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 */
-#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 */
-               tprints(", ");
-               printfd(tcp, u_arg[4]);
-               /* offset */
-#if defined(ALPHA) || defined(X32)
-               printllval(tcp, ", %#llx", 5);
-#else
-               /* NOTE: not verified that [5] and [6] should be used.
-                * It's possible that long long is 64-bit aligned in memory
-                * and we need to use [6] and [7] here instead:
-                */
-               tprintf(", %#llx", LONG_LONG(u_arg[5], u_arg[6]));
-#endif
-       }
-       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);
+}
+
+/* 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);
 }
-#endif /* _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T */
 
 int
 sys_munmap(struct tcb *tcp)
@@ -383,11 +316,11 @@ sys_mprotect(struct tcb *tcp)
 }
 
 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
@@ -408,21 +341,54 @@ 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
+#ifdef MADV_MERGEABLE
+       XLAT(MADV_MERGEABLE),
+#endif
+#ifdef MADV_UNMERGEABLE
+       XLAT(MADV_UNMERGEABLE),
+#endif
+#ifdef MADV_HUGEPAGE
+       XLAT(MADV_HUGEPAGE),
 #endif
-       { 0,                    NULL },
+#ifdef MADV_NOHUGEPAGE
+       XLAT(MADV_NOHUGEPAGE),
+#endif
+#ifdef MADV_DONTDUMP
+       XLAT(MADV_DONTDUMP),
+#endif
+#ifdef MADV_DODUMP
+       XLAT(MADV_DODUMP),
+#endif
+       XLAT_END
 };
 
 int
@@ -437,12 +403,12 @@ sys_madvise(struct tcb *tcp)
 
 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
@@ -458,11 +424,11 @@ sys_mlockall(struct tcb *tcp)
 
 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
@@ -484,18 +450,18 @@ sys_msync(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
@@ -571,117 +537,6 @@ sys_getpagesize(struct tcb *tcp)
 }
 #endif
 
-#if 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(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 */
-
-#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)
 {
@@ -712,30 +567,30 @@ sys_remap_file_pages(struct tcb *tcp)
 #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