Remove HAVE_STRUCT_TCB_EXT_ARG, ext_arg, and u_lrval

[strace] / mem.c

diff --git a/mem.c b/mem.c
index 9ce867ac3ac6f6553346220e31609e65fcd8f258..6a541cfb6b39afc0406c643364c1b784eb023d30 100644 (file)
--- a/mem.c
+++ b/mem.c
@@ -55,16 +55,16 @@ SYS_FUNC(brk)
 #include "xlat/mmap_flags.h"
 
 static void
-print_mmap(struct tcb *tcp, kernel_ureg_t *u_arg, unsigned long long offset)
+print_mmap(struct tcb *tcp, kernel_ulong_t *u_arg, unsigned long long offset)
 {
-       const kernel_ureg_t addr = u_arg[0];
-       const kernel_ureg_t len = u_arg[1];
-       const kernel_ureg_t prot = u_arg[2];
-       const kernel_ureg_t flags = u_arg[3];
+       const kernel_ulong_t addr = u_arg[0];
+       const kernel_ulong_t len = u_arg[1];
+       const kernel_ulong_t prot = u_arg[2];
+       const kernel_ulong_t flags = u_arg[3];
        const int fd = u_arg[4];
 
        printaddr(addr);
-       tprintf(", %" PRI_kru ", ", len);
+       tprintf(", %" PRI_klu ", ", len);
        printflags64(mmap_prot, prot, "PROT_???");
        tprints(", ");
 #ifdef MAP_TYPE
@@ -93,7 +93,7 @@ print_mmap(struct tcb *tcp, kernel_ureg_t *u_arg, unsigned long long offset)
 /* Params are pointed to by u_arg[0], offset is in bytes */
 SYS_FUNC(old_mmap)
 {
-       kernel_ureg_t u_arg[6];
+       kernel_ulong_t u_arg[6];
 # ifndef current_klongsize
        /* We are here only in a 32-bit personality. */
        unsigned int narrow_arg[6];
@@ -116,7 +116,7 @@ SYS_FUNC(old_mmap)
 /* Params are pointed to by u_arg[0], offset is in pages */
 SYS_FUNC(old_mmap_pgoff)
 {
-       kernel_ureg_t u_arg[5];
+       kernel_ulong_t u_arg[5];
        int i;
        unsigned int narrow_arg[6];
        unsigned long long offset;
@@ -135,18 +135,12 @@ SYS_FUNC(old_mmap_pgoff)
 /* Params are passed directly, offset is in bytes */
 SYS_FUNC(mmap)
 {
-       unsigned long long offset =
-#if HAVE_STRUCT_TCB_EXT_ARG
-               tcp->ext_arg[5];        /* try test/x32_mmap.c */
-#else
-               tcp->u_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);
+       print_mmap(tcp, tcp->u_arg, tcp->u_arg[5]);
 
        return RVAL_DECODED | RVAL_HEX;
 }
@@ -177,7 +171,7 @@ SYS_FUNC(mmap_4koff)
 SYS_FUNC(munmap)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %" PRI_kru, tcp->u_arg[1]);
+       tprintf(", %" PRI_klu, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
@@ -185,9 +179,9 @@ SYS_FUNC(munmap)
 static int
 do_mprotect(struct tcb *tcp, bool has_pkey)
 {
-       printaddr_klu(getarg_klu(tcp, 0));
-       tprintf(", %" PRI_klu ", ", getarg_klu(tcp, 1));
-       printflags64(mmap_prot, getarg_klu(tcp, 2), "PROT_???");
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
+       printflags64(mmap_prot, tcp->u_arg[2], "PROT_???");
 
        if (has_pkey)
                tprintf(", %d", (int) tcp->u_arg[3]);
@@ -210,7 +204,7 @@ SYS_FUNC(pkey_mprotect)
 SYS_FUNC(mremap)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %" PRI_kru ", %" PRI_kru ", ", tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %" PRI_klu ", %" PRI_klu ", ", tcp->u_arg[1], tcp->u_arg[2]);
        printflags64(mremap_flags, tcp->u_arg[3], "MREMAP_???");
 #ifdef MREMAP_FIXED
        if ((tcp->u_arg[3] & (MREMAP_MAYMOVE | MREMAP_FIXED)) ==
@@ -227,7 +221,7 @@ SYS_FUNC(mremap)
 SYS_FUNC(madvise)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
        printxval(madvise_cmds, tcp->u_arg[2], "MADV_???");
 
        return RVAL_DECODED;
@@ -249,7 +243,7 @@ SYS_FUNC(msync)
        /* addr */
        printaddr(tcp->u_arg[0]);
        /* len */
-       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
        /* flags */
        printflags(mctl_sync, tcp->u_arg[2], "MS_???");
 
@@ -261,7 +255,7 @@ SYS_FUNC(msync)
 SYS_FUNC(mlock2)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
        printflags(mlock_flags, tcp->u_arg[2], "MLOCK_???");
 
        return RVAL_DECODED;
@@ -271,7 +265,7 @@ SYS_FUNC(mincore)
 {
        if (entering(tcp)) {
                printaddr(tcp->u_arg[0]);
-               tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
+               tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
        } else {
                const unsigned long page_size = get_pagesize();
                const unsigned long page_mask = page_size - 1;
@@ -312,16 +306,16 @@ SYS_FUNC(getpagesize)
 
 SYS_FUNC(remap_file_pages)
 {
-       const kernel_ureg_t addr = tcp->u_arg[0];
-       const kernel_ureg_t size = tcp->u_arg[1];
-       const kernel_ureg_t prot = tcp->u_arg[2];
-       const kernel_ureg_t pgoff = tcp->u_arg[3];
-       const kernel_ureg_t flags = tcp->u_arg[4];
+       const kernel_ulong_t addr = tcp->u_arg[0];
+       const kernel_ulong_t size = tcp->u_arg[1];
+       const kernel_ulong_t prot = tcp->u_arg[2];
+       const kernel_ulong_t pgoff = tcp->u_arg[3];
+       const kernel_ulong_t flags = tcp->u_arg[4];
 
        printaddr(addr);
-       tprintf(", %" PRI_kru ", ", size);
+       tprintf(", %" PRI_klu ", ", size);
        printflags64(mmap_prot, prot, "PROT_???");
-       tprintf(", %" PRI_kru ", ", pgoff);
+       tprintf(", %" PRI_klu ", ", pgoff);
 #ifdef MAP_TYPE
        printxval64(mmap_flags, flags & MAP_TYPE, "MAP_???");
        addflags(mmap_flags, flags & ~MAP_TYPE);
@@ -343,13 +337,13 @@ print_protmap_entry(struct tcb *tcp, void *elem_buf, size_t elem_size, void *dat
 
 SYS_FUNC(subpage_prot)
 {
-       kernel_ureg_t addr = tcp->u_arg[0];
-       kernel_ureg_t len = tcp->u_arg[1];
-       kernel_ureg_t nmemb = len >> 16;
-       kernel_ureg_t map = tcp->u_arg[2];
+       kernel_ulong_t addr = tcp->u_arg[0];
+       kernel_ulong_t len = tcp->u_arg[1];
+       kernel_ulong_t nmemb = len >> 16;
+       kernel_ulong_t map = tcp->u_arg[2];
 
        printaddr(addr);
-       tprintf(", %" PRI_kru ", ", len);
+       tprintf(", %" PRI_klu ", ", len);
 
        unsigned int entry;
        print_array(tcp, map, nmemb, &entry, sizeof(entry),