]> granicus.if.org Git - strace/blobdiff - mem.c
"Modernize" all old-style function parameter declarations
[strace] / mem.c
diff --git a/mem.c b/mem.c
index b1447e547754ff36d13f3f80222057e5c538e201..4adb570c7993d23dbb7f9ffe1f6c35d4736b4ffd 100644 (file)
--- a/mem.c
+++ b/mem.c
@@ -57,8 +57,7 @@
 #endif
 
 int
-sys_brk(tcp)
-struct tcb *tcp;
+sys_brk(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%#lx", tcp->u_arg[0]);
@@ -72,8 +71,7 @@ struct tcb *tcp;
 
 #if defined(FREEBSD) || defined(SUNOS4)
 int
-sys_sbrk(tcp)
-struct tcb *tcp;
+sys_sbrk(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%lu", tcp->u_arg[0]);
@@ -95,6 +93,9 @@ static const struct xlat mmap_prot[] = {
 #endif
 #ifdef PROT_GROWSUP
        { PROT_GROWSUP, "PROT_GROWSUP"  },
+#endif
+#ifdef PROT_SAO
+       { PROT_SAO,     "PROT_SAO"      },
 #endif
        { 0,            NULL            },
 };
@@ -184,16 +185,53 @@ static const struct xlat mmap_flags[] = {
 #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" },
 #endif
        { 0,            NULL            },
 };
 
-#if !HAVE_LONG_LONG_OFF_T
+#ifdef TILE
 static
 int
-print_mmap(tcp,u_arg)
-struct tcb *tcp;
-long *u_arg;
+addtileflags(flags)
+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) {
+                       tprintf("|MAP_CACHE_INCOHERENT");
+                       return flags;
+               }
+               tprintf("|_MAP_CACHE_INCOHERENT");
+       }
+
+       switch (home) {
+       case 0: break;
+       case MAP_CACHE_HOME_HERE: tprintf("|MAP_CACHE_HOME_HERE"); break;
+       case MAP_CACHE_HOME_NONE: tprintf("|MAP_CACHE_HOME_NONE"); break;
+       case MAP_CACHE_HOME_SINGLE: tprintf("|MAP_CACHE_HOME_SINGLE"); break;
+       case MAP_CACHE_HOME_TASK: tprintf("|MAP_CACHE_HOME_TASK"); break;
+       case MAP_CACHE_HOME_HASH: tprintf("|MAP_CACHE_HOME_HASH"); break;
+       default:
+               tprintf("|MAP_CACHE_HOME(%d)",
+                       (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, long long offset)
 {
        if (entering(tcp)) {
                /* addr */
@@ -209,88 +247,94 @@ long *u_arg;
                /* 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
-               /* fd (is always int, not long) */
-               tprintf(", %d, ", (int)u_arg[4]);
+               /* fd */
+               tprintf(", ");
+               printfd(tcp, u_arg[4]);
                /* offset */
-               tprintf("%#lx", u_arg[5]);
+               tprintf(", %#llx", offset);
        }
        return RVAL_HEX;
 }
 
 #ifdef LINUX
-int sys_old_mmap(tcp)
-struct tcb *tcp;
+int sys_old_mmap(struct tcb *tcp)
 {
-    long u_arg[6];
+       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)
-               return 0;
-       else
-               u_arg[i] = v;
+       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)
+                       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];
+       /* SH has always passed the args in registers */
+       int i;
+       for (i=0; i<6; i++)
+               u_arg[i] = tcp->u_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
+       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)
-           return 0;
+       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);
-
+       return print_mmap(tcp, u_arg, u_arg[5]);
 }
 #endif
 
 int
-sys_mmap(tcp)
-struct tcb *tcp;
+sys_mmap(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.
-     */
-    tcp->u_arg[5] <<= PAGE_SHIFT;
-#endif
-    return print_mmap(tcp, tcp->u_arg);
+       /*
+        * 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;
+#endif
+#if defined(LINUX_MIPSN32)
+       offset = tcp->ext_arg[5];
+#endif
+       return print_mmap(tcp, tcp->u_arg, offset);
 }
 #endif /* !HAVE_LONG_LONG_OFF_T */
 
 #if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
 int
-sys_mmap64(tcp)
-struct tcb *tcp;
+sys_mmap64(struct tcb *tcp)
 {
 #ifdef linux
 #ifdef ALPHA
@@ -310,7 +354,6 @@ struct tcb *tcp;
                        return 0;
 #endif /* ALPHA */
 #endif /* linux */
-               ALIGN64 (tcp, 5);       /* FreeBSD wierdies */
 
                /* addr */
                tprintf("%#lx, ", u_arg[0]);
@@ -327,9 +370,10 @@ struct tcb *tcp;
                printflags(mmap_flags, u_arg[3], "MAP_???");
 #endif
                /* fd */
-               tprintf(", %ld, ", u_arg[4]);
+               tprintf(", ");
+               printfd(tcp, tcp->u_arg[4]);
                /* offset */
-               tprintf("%#llx", LONG_LONG(u_arg[5], u_arg[6]));
+               printllval(tcp, ", %#llx", 5);
        }
        return RVAL_HEX;
 }
@@ -337,8 +381,7 @@ struct tcb *tcp;
 
 
 int
-sys_munmap(tcp)
-struct tcb *tcp;
+sys_munmap(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%#lx, %lu",
@@ -348,8 +391,7 @@ struct tcb *tcp;
 }
 
 int
-sys_mprotect(tcp)
-struct tcb *tcp;
+sys_mprotect(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%#lx, %lu, ",
@@ -363,26 +405,33 @@ struct tcb *tcp;
 
 static const struct xlat mremap_flags[] = {
        { MREMAP_MAYMOVE,       "MREMAP_MAYMOVE"        },
+#ifdef MREMAP_FIXED
+       { MREMAP_FIXED,         "MREMAP_FIXED"          },
+#endif
        { 0,                    NULL                    }
 };
 
 int
-sys_mremap(tcp)
-struct tcb *tcp;
+sys_mremap(struct tcb *tcp)
 {
        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_???");
+#ifdef MREMAP_FIXED
+               if ((tcp->u_arg[3] & (MREMAP_MAYMOVE | MREMAP_FIXED)) ==
+                   (MREMAP_MAYMOVE | MREMAP_FIXED))
+                       tprintf(", %#lx", tcp->u_arg[4]);
+#endif
        }
        return RVAL_HEX;
 }
 
-static const struct xlat madvise_flags[] = {
+static const struct xlat madvise_cmds[] = {
 #ifdef MADV_NORMAL
        { MADV_NORMAL,          "MADV_NORMAL" },
 #endif
-#ifdef MADZV_RANDOM
+#ifdef MADV_RANDOM
        { MADV_RANDOM,          "MADV_RANDOM" },
 #endif
 #ifdef MADV_SEQUENTIAL
@@ -391,7 +440,7 @@ static const struct xlat madvise_flags[] = {
 #ifdef MADV_WILLNEED
        { MADV_WILLNEED,        "MADV_WILLNEED" },
 #endif
-#ifdef MADV_DONTNED
+#ifdef MADV_DONTNEED
        { MADV_DONTNEED,        "MADV_DONTNEED" },
 #endif
        { 0,                    NULL },
@@ -399,12 +448,11 @@ static const struct xlat madvise_flags[] = {
 
 
 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]);
-               printflags(madvise_flags, tcp->u_arg[2], "MADV_???");
+               printxval(madvise_cmds, tcp->u_arg[2], "MADV_???");
        }
        return 0;
 }
@@ -421,8 +469,7 @@ static const struct xlat mlockall_flags[] = {
 };
 
 int
-sys_mlockall(tcp)
-struct tcb *tcp;
+sys_mlockall(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printflags(mlockall_flags, tcp->u_arg[0], "MCL_???");
@@ -445,8 +492,7 @@ static const struct xlat mctl_sync[] = {
 };
 
 int
-sys_msync(tcp)
-struct tcb *tcp;
+sys_msync(struct tcb *tcp)
 {
        if (entering(tcp)) {
                /* addr */
@@ -479,8 +525,7 @@ static const struct xlat mctl_lockas[] = {
 };
 
 int
-sys_mctl(tcp)
-struct tcb *tcp;
+sys_mctl(struct tcb *tcp)
 {
        int arg, function;
 
@@ -513,8 +558,7 @@ 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;
@@ -544,10 +588,9 @@ struct tcb *tcp;
        return 0;
 }
 
-#if defined(ALPHA) || defined(FREEBSD) || defined(IA64) || defined(SUNOS4) || defined(SVR4)
+#if defined(ALPHA) || defined(FREEBSD) || defined(IA64) || defined(SUNOS4) || defined(SVR4) || defined(SPARC) || defined(SPARC64)
 int
-sys_getpagesize(tcp)
-struct tcb *tcp;
+sys_getpagesize(struct tcb *tcp)
 {
        if (exiting(tcp))
                return RVAL_HEX;
@@ -557,8 +600,7 @@ struct tcb *tcp;
 
 #if defined(LINUX) && defined(__i386__)
 void
-print_ldt_entry (ldt_entry)
-struct modify_ldt_ldt_s *ldt_entry;
+print_ldt_entry(struct modify_ldt_ldt_s *ldt_entry)
 {
        tprintf("base_addr:%#08lx, "
                "limit:%d, "
@@ -568,7 +610,7 @@ struct modify_ldt_ldt_s *ldt_entry;
                "limit_in_pages:%d, "
                "seg_not_present:%d, "
                "useable:%d}",
-               ldt_entry->base_addr,
+               (long) ldt_entry->base_addr,
                ldt_entry->limit,
                ldt_entry->seg_32bit,
                ldt_entry->contents,
@@ -579,8 +621,7 @@ struct modify_ldt_ldt_s *ldt_entry;
 }
 
 int
-sys_modify_ldt(tcp)
-struct tcb *tcp;
+sys_modify_ldt(struct tcb *tcp)
 {
        if (entering(tcp)) {
                struct modify_ldt_ldt_s copy;
@@ -603,8 +644,7 @@ struct tcb *tcp;
 }
 
 int
-sys_set_thread_area(tcp)
-struct tcb *tcp;
+sys_set_thread_area(struct tcb *tcp)
 {
        struct modify_ldt_ldt_s copy;
        if (entering(tcp)) {
@@ -632,8 +672,7 @@ struct tcb *tcp;
 }
 
 int
-sys_get_thread_area(tcp)
-struct tcb *tcp;
+sys_get_thread_area(struct tcb *tcp)
 {
        struct modify_ldt_ldt_s copy;
        if (exiting(tcp)) {
@@ -653,10 +692,27 @@ struct tcb *tcp;
 }
 #endif /* LINUX && __i386__ */
 
+#if defined(LINUX) && 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
+
 #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]);
@@ -682,6 +738,8 @@ 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[] = {
@@ -694,6 +752,8 @@ static const struct xlat policies[] = {
 
 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                    }
 };
 
@@ -703,13 +763,15 @@ static const struct xlat mempolicyflags[] = {
        { 0,                    NULL                    }
 };
 
+static const struct xlat move_pages_flags[] = {
+       { MPOL_MF_MOVE,         "MPOL_MF_MOVE"          },
+       { MPOL_MF_MOVE_ALL,     "MPOL_MF_MOVE_ALL"      },
+       { 0,                    NULL                    }
+};
+
 
 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;
 
@@ -752,11 +814,10 @@ int err;
 }
 
 int
-sys_mbind(tcp)
-struct tcb *tcp;
+sys_mbind(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%lu, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
+               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(", ");
@@ -766,8 +827,7 @@ struct tcb *tcp;
 }
 
 int
-sys_set_mempolicy(tcp)
-struct tcb *tcp;
+sys_set_mempolicy(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printxval(policies, tcp->u_arg[0], "MPOL_???");
@@ -777,8 +837,7 @@ struct tcb *tcp;
 }
 
 int
-sys_get_mempolicy(tcp)
-struct tcb *tcp;
+sys_get_mempolicy(struct tcb *tcp)
 {
        if (exiting(tcp)) {
                int pol;
@@ -794,4 +853,124 @@ struct tcb *tcp;
        }
        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, ");
+               else {
+                       int i;
+                       long puser = tcp->u_arg[2];
+                       tprintf("{");
+                       for (i = 0; i < npages; ++i) {
+                               void *p;
+                               if (i > 0)
+                                       tprintf(", ");
+                               if (umove(tcp, puser, &p) < 0) {
+                                       tprintf("???");
+                                       break;
+                               }
+                               tprintf("%p", p);
+                               puser += sizeof (void *);
+                       }
+                       tprintf("}, ");
+               }
+               if (tcp->u_arg[3] == 0)
+                       tprintf("NULL, ");
+               else {
+                       int i;
+                       long nodeuser = tcp->u_arg[3];
+                       tprintf("{");
+                       for (i = 0; i < npages; ++i) {
+                               int node;
+                               if (i > 0)
+                                       tprintf(", ");
+                               if (umove(tcp, nodeuser, &node) < 0) {
+                                       tprintf("???");
+                                       break;
+                               }
+                               tprintf("%#x", node);
+                               nodeuser += sizeof (int);
+                       }
+                       tprintf("}, ");
+               }
+       }
+       if (exiting(tcp)) {
+               unsigned long npages = tcp->u_arg[1];
+               if (tcp->u_arg[4] == 0)
+                       tprintf("NULL, ");
+               else {
+                       int i;
+                       long statususer = tcp->u_arg[4];
+                       tprintf("{");
+                       for (i = 0; i < npages; ++i) {
+                               int status;
+                               if (i > 0)
+                                       tprintf(", ");
+                               if (umove(tcp, statususer, &status) < 0) {
+                                       tprintf("???");
+                                       break;
+                               }
+                               tprintf("%#x", status);
+                               statususer += sizeof (int);
+                       }
+                       tprintf("}, ");
+               }
+               printflags(move_pages_flags, tcp->u_arg[5], "MPOL_???");
+       }
+       return 0;
+}
+#endif
+
+#if defined(LINUX) && defined(POWERPC)
+int
+sys_subpage_prot(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               unsigned long cur, end, abbrev_end, entries;
+               unsigned int entry;
+
+               tprintf("%#lx, %#lx, ", tcp->u_arg[0], tcp->u_arg[1]);
+               entries = tcp->u_arg[1] >> 16;
+               if (!entries || !tcp->u_arg[2]) {
+                       tprintf("{}");
+                       return 0;
+               }
+               cur = tcp->u_arg[2];
+               end = cur + (sizeof(int) * entries);
+               if (!verbose(tcp) || end < tcp->u_arg[2]) {
+                       tprintf("%#lx", tcp->u_arg[2]);
+                       return 0;
+               }
+               if (abbrev(tcp)) {
+                       abbrev_end = cur + (sizeof(int) * max_strlen);
+                       if (abbrev_end > end)
+                               abbrev_end = end;
+               }
+               else
+                       abbrev_end = end;
+               tprintf("{");
+               for (; cur < end; cur += sizeof(int)) {
+                       if (cur > tcp->u_arg[2])
+                               tprintf(", ");
+                       if (cur >= abbrev_end) {
+                               tprintf("...");
+                               break;
+                       }
+                       if (umove(tcp, cur, &entry) < 0) {
+                               tprintf("??? [%#lx]", cur);
+                               break;
+                       }
+                       else
+                               tprintf("%#08x", entry);
+               }
+               tprintf("}");
+       }
+
+       return 0;
+}
 #endif