#include <asm/mman.h>
#include <sys/mman.h>
-static unsigned long
-get_pagesize()
+unsigned long
+get_pagesize(void)
{
static unsigned long pagesize;
return pagesize;
}
-int
-sys_brk(struct tcb *tcp)
+SYS_FUNC(brk)
{
- if (entering(tcp)) {
- tprintf("%#lx", tcp->u_arg[0]);
- }
- return RVAL_HEX;
+ printaddr(tcp->u_arg[0]);
+
+ return RVAL_DECODED | RVAL_HEX;
}
#include "xlat/mmap_prot.h"
#include "xlat/mmap_flags.h"
-static int
+static void
print_mmap(struct tcb *tcp, long *u_arg, unsigned long long offset)
{
- if (entering(tcp)) {
- /* 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 */
+ /* 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
- tprints(", ");
- /* fd */
- printfd(tcp, u_arg[4]);
- /* offset */
- tprintf(", %#llx", offset);
- }
- return RVAL_HEX;
+ tprints(", ");
+ /* fd */
+ printfd(tcp, u_arg[4]);
+ /* offset */
+ tprintf(", %#llx", offset);
}
/* Syscall name<->function correspondence is messed up on many arches.
*/
/* Params are pointed to by u_arg[0], offset is in bytes */
-int
-sys_old_mmap(struct tcb *tcp)
+SYS_FUNC(old_mmap)
{
long u_arg[6];
#if defined(IA64)
*/
int i;
unsigned narrow_arg[6];
- if (umoven(tcp, tcp->u_arg[0], sizeof(narrow_arg), (char *) narrow_arg) == -1)
+ 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];
/* 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)
+ 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)
+ if (umoven(tcp, tcp->u_arg[0], sizeof(u_arg), u_arg) == -1)
return 0;
#endif
- return print_mmap(tcp, u_arg, (unsigned long) u_arg[5]);
+ print_mmap(tcp, u_arg, (unsigned long) u_arg[5]);
+
+ return RVAL_DECODED | RVAL_HEX;
}
#if defined(S390)
/* Params are pointed to by u_arg[0], offset is in pages */
-int
-sys_old_mmap_pgoff(struct tcb *tcp)
+SYS_FUNC(old_mmap_pgoff)
{
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)
+ 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();
- return print_mmap(tcp, u_arg, offset);
+ print_mmap(tcp, u_arg, offset);
+
+ return RVAL_DECODED | RVAL_HEX;
}
#endif
/* Params are passed directly, offset is in bytes */
-int
-sys_mmap(struct tcb *tcp)
+SYS_FUNC(mmap)
{
unsigned long long offset = (unsigned long) tcp->u_arg[5];
#if defined(LINUX_MIPSN32) || defined(X32)
* 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);
+ print_mmap(tcp, tcp->u_arg, offset);
+
+ return RVAL_DECODED | RVAL_HEX;
}
/* Params are passed directly, offset is in pages */
-int
-sys_mmap_pgoff(struct tcb *tcp)
+SYS_FUNC(mmap_pgoff)
{
/* 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);
+ print_mmap(tcp, tcp->u_arg, offset);
+
+ return RVAL_DECODED | RVAL_HEX;
}
/* Params are passed directly, offset is in 4k units */
-int
-sys_mmap_4koff(struct tcb *tcp)
+SYS_FUNC(mmap_4koff)
{
unsigned long long offset;
offset = (unsigned long) tcp->u_arg[5];
offset <<= 12;
- return print_mmap(tcp, tcp->u_arg, offset);
+ print_mmap(tcp, tcp->u_arg, offset);
+
+ return RVAL_DECODED | RVAL_HEX;
}
-int
-sys_munmap(struct tcb *tcp)
+SYS_FUNC(munmap)
{
- if (entering(tcp)) {
- tprintf("%#lx, %lu",
- tcp->u_arg[0], tcp->u_arg[1]);
- }
- return 0;
+ printaddr(tcp->u_arg[0]);
+ tprintf(", %lu", tcp->u_arg[1]);
+
+ return RVAL_DECODED;
}
-int
-sys_mprotect(struct tcb *tcp)
+SYS_FUNC(mprotect)
{
- if (entering(tcp)) {
- tprintf("%#lx, %lu, ",
- tcp->u_arg[0], tcp->u_arg[1]);
- printflags(mmap_prot, tcp->u_arg[2], "PROT_???");
- }
- return 0;
+ printaddr(tcp->u_arg[0]);
+ tprintf(", %lu, ", tcp->u_arg[1]);
+ printflags(mmap_prot, tcp->u_arg[2], "PROT_???");
+
+ return RVAL_DECODED;
}
#include "xlat/mremap_flags.h"
-int
-sys_mremap(struct tcb *tcp)
+SYS_FUNC(mremap)
{
- 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_???");
+ 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))
- tprintf(", %#lx", tcp->u_arg[4]);
-#endif
+ if ((tcp->u_arg[3] & (MREMAP_MAYMOVE | MREMAP_FIXED)) ==
+ (MREMAP_MAYMOVE | MREMAP_FIXED)) {
+ tprints(", ");
+ printaddr(tcp->u_arg[4]);
}
- return RVAL_HEX;
+#endif
+ return RVAL_DECODED | RVAL_HEX;
}
#include "xlat/madvise_cmds.h"
-int
-sys_madvise(struct tcb *tcp)
+SYS_FUNC(madvise)
{
- if (entering(tcp)) {
- tprintf("%#lx, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
- printxval(madvise_cmds, tcp->u_arg[2], "MADV_???");
- }
- return 0;
+ printaddr(tcp->u_arg[0]);
+ tprintf(", %lu, ", tcp->u_arg[1]);
+ printxval(madvise_cmds, tcp->u_arg[2], "MADV_???");
+
+ return RVAL_DECODED;
}
#include "xlat/mlockall_flags.h"
-int
-sys_mlockall(struct tcb *tcp)
+SYS_FUNC(mlockall)
{
- if (entering(tcp)) {
- printflags(mlockall_flags, tcp->u_arg[0], "MCL_???");
- }
- return 0;
-}
+ printflags(mlockall_flags, tcp->u_arg[0], "MCL_???");
-#ifdef MS_ASYNC
+ return RVAL_DECODED;
+}
#include "xlat/mctl_sync.h"
-int
-sys_msync(struct tcb *tcp)
+SYS_FUNC(msync)
{
- 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;
+ /* 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 /* MS_ASYNC */
-
-#ifdef MC_SYNC
+#include "xlat/mlock_flags.h"
-#include "xlat/mctl_funcs.h"
-#include "xlat/mctl_lockas.h"
-
-int
-sys_mctl(struct tcb *tcp)
+SYS_FUNC(mlock2)
{
- int arg, function;
+ printaddr(tcp->u_arg[0]);
+ tprintf(", %lu, ", tcp->u_arg[1]);
+ printflags(mlock_flags, tcp->u_arg[2], "MLOCK_???");
- 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];
- tprints(", ");
- 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;
+ return RVAL_DECODED;
}
-#endif /* MC_SYNC */
-
-int
-sys_mincore(struct tcb *tcp)
+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 {
tprints("[");
for (i = 0; i < len; i++) {
return 0;
}
-#if defined(ALPHA) || defined(IA64) || defined(SPARC) || defined(SPARC64)
-int
-sys_getpagesize(struct tcb *tcp)
+#if defined ALPHA || defined IA64 || defined M68K \
+ || defined SPARC || defined SPARC64
+SYS_FUNC(getpagesize)
{
- if (exiting(tcp))
- return RVAL_HEX;
- return 0;
+ return RVAL_DECODED | RVAL_HEX;
}
#endif
-int
-sys_remap_file_pages(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
tprints("...");
break;
}
- if (umoven(tcp, cur, sizeof(n), (char *) &n) < 0) {
+ if (umoven(tcp, cur, sizeof(n), &n) < 0) {
tprints("?");
failed = 1;
break;
tprintf("%#0*lx", (int) sizeof(long) * 2 + 2, n);
}
tprints("}");
- if (failed)
- tprintf(" %#lx", ptr);
- } else
- tprintf(", %#lx", ptr);
+ if (failed) {
+ tprints(" ");
+ printaddr(ptr);
+ }
+ } else {
+ tprints(" ");
+ printaddr(ptr);
+ }
tprintf(", %lu", maxnodes);
}
-int
-sys_mbind(struct tcb *tcp)
+SYS_FUNC(mbind)
{
- 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);
- tprints(", ");
- 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(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(struct tcb *tcp)
+SYS_FUNC(get_mempolicy)
{
if (exiting(tcp)) {
int pol;
- if (tcp->u_arg[0] == 0)
- tprints("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;
}
-int
-sys_migrate_pages(struct tcb *tcp)
+SYS_FUNC(migrate_pages)
{
- 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;
+ 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;
}
-int
-sys_move_pages(struct tcb *tcp)
+SYS_FUNC(move_pages)
{
if (entering(tcp)) {
unsigned long npages = tcp->u_arg[1];
if (tcp->u_arg[2] == 0)
tprints("NULL, ");
else {
- int i;
+ unsigned int i;
long puser = tcp->u_arg[2];
tprints("{");
for (i = 0; i < npages; ++i) {
if (tcp->u_arg[3] == 0)
tprints("NULL, ");
else {
- int i;
+ unsigned int i;
long nodeuser = tcp->u_arg[3];
tprints("{");
for (i = 0; i < npages; ++i) {
}
tprints("}, ");
}
- }
- if (exiting(tcp)) {
+ } else {
unsigned long npages = tcp->u_arg[1];
if (tcp->u_arg[4] == 0)
tprints("NULL, ");
else {
- int i;
+ unsigned int i;
long statususer = tcp->u_arg[4];
tprints("{");
for (i = 0; i < npages; ++i) {
}
#if defined(POWERPC)
-int
-sys_subpage_prot(struct tcb *tcp)
+SYS_FUNC(subpage_prot)
{
- 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]) {
- tprints("{}");
- 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;
+ 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 (abbrev(tcp)) {
- abbrev_end = cur + (sizeof(int) * max_strlen);
- if (abbrev_end > end)
- abbrev_end = end;
+ if (umove(tcp, cur, &entry) < 0) {
+ tprintf("??? [%#lx]", cur);
+ break;
}
else
- abbrev_end = end;
- tprints("{");
- for (; cur < end; cur += sizeof(int)) {
- if (cur > 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("}");
+ tprintf("%#08x", entry);
}
+ tprints("}");
- return 0;
+ return RVAL_DECODED;
}
#endif
projects / strace / blobdiff