* Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
* Copyright (c) 2003-2006 Roland McGrath <roland@redhat.com>
* Copyright (c) 2006-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
# include <linux/shm.h>
#endif
+#ifndef SHM_HUGE_SHIFT
+# define SHM_HUGE_SHIFT 26
+#endif
+
+#ifndef SHM_HUGE_MASK
+# define SHM_HUGE_MASK 0x3f
+#endif
+
#include "xlat/shm_resource_flags.h"
#include "xlat/shm_flags.h"
SYS_FUNC(shmget)
{
- if (tcp->u_arg[0])
- tprintf("%#lx", tcp->u_arg[0]);
+ const int key = (int) tcp->u_arg[0];
+ if (key)
+ tprintf("%#x", key);
else
tprints("IPC_PRIVATE");
- tprintf(", %lu, ", tcp->u_arg[1]);
- if (printflags(shm_resource_flags, tcp->u_arg[2] & ~0777, NULL) != 0)
+ tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
+
+ unsigned int flags = tcp->u_arg[2] & ~0777;
+ const unsigned int mask = SHM_HUGE_MASK << SHM_HUGE_SHIFT;
+ const unsigned int hugetlb_value = flags & mask;
+
+ flags &= ~mask;
+ if (flags || !hugetlb_value)
+ printflags(shm_resource_flags, flags, NULL);
+
+ if (hugetlb_value)
+ tprintf("%s%u<<SHM_HUGE_SHIFT",
+ flags ? "|" : "",
+ hugetlb_value >> SHM_HUGE_SHIFT);
+
+ if (flags || hugetlb_value)
tprints("|");
- tprintf("%#lo", tcp->u_arg[2] & 0777);
+ print_numeric_umode_t(tcp->u_arg[2] & 0777);
+
return RVAL_DECODED;
}
SYS_FUNC(shmat)
{
if (entering(tcp)) {
- tprintf("%lu, ", tcp->u_arg[0]);
+ tprintf("%d, ", (int) tcp->u_arg[0]);
if (indirect_ipccall(tcp)) {
printaddr(tcp->u_arg[3]);
tprints(", ");
if (syserror(tcp))
return 0;
if (indirect_ipccall(tcp)) {
- unsigned long raddr;
- if (umove(tcp, tcp->u_arg[2], &raddr) < 0)
+ union {
+ uint64_t r64;
+ uint32_t r32;
+ } u;
+ if (umoven(tcp, tcp->u_arg[2], current_wordsize, &u) < 0)
return RVAL_NONE;
- tcp->u_rval = raddr;
+ tcp->u_rval = (sizeof(u.r32) == current_wordsize)
+ ? u.r32 : u.r64;
}
return RVAL_HEX;
}