*/
#include "defs.h"
-#include <sys/user.h>
-#include <fcntl.h>
-
-#ifdef HAVE_SYS_REG_H
-# include <sys/reg.h>
-# ifndef PTRACE_PEEKUSR
-# define PTRACE_PEEKUSR PTRACE_PEEKUSER
-# endif
-# ifndef PTRACE_POKEUSR
-# define PTRACE_POKEUSR PTRACE_POKEUSER
-# endif
-#elif defined(HAVE_LINUX_PTRACE_H)
-# undef PTRACE_SYSCALL
-# ifdef HAVE_STRUCT_IA64_FPREG
-# define ia64_fpreg XXX_ia64_fpreg
-# endif
-# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
-# define pt_all_user_regs XXX_pt_all_user_regs
-# endif
-# include <linux/ptrace.h>
-# undef ia64_fpreg
-# undef pt_all_user_regs
-#endif
-
-#ifdef IA64
-# include <asm/ptrace_offsets.h>
-#endif
-
-#if defined(SPARC) || defined(SPARC64) || defined(MIPS)
-typedef struct {
- struct pt_regs si_regs;
- int si_mask;
-} m_siginfo_t;
-#elif defined HAVE_ASM_SIGCONTEXT_H
-# if !defined(IA64) && !defined(X86_64) && !defined(X32)
-# include <asm/sigcontext.h>
-# endif
-#else /* !HAVE_ASM_SIGCONTEXT_H */
-# if defined M68K && !defined HAVE_STRUCT_SIGCONTEXT
-struct sigcontext {
- unsigned long sc_mask;
- unsigned long sc_usp;
- unsigned long sc_d0;
- unsigned long sc_d1;
- unsigned long sc_a0;
- unsigned long sc_a1;
- unsigned short sc_sr;
- unsigned long sc_pc;
- unsigned short sc_formatvec;
-};
-# endif /* M68K */
-#endif /* !HAVE_ASM_SIGCONTEXT_H */
+#include <signal.h>
#ifndef NSIG
-# warning: NSIG is not defined, using 32
+# warning NSIG is not defined, using 32
# define NSIG 32
+#elif NSIG < 32
+# error NSIG < 32
#endif
-#ifdef HAVE_SIGACTION
-
-#if defined I386 || defined X86_64 || defined X32
/* The libc headers do not define this constant since it should only be
used by the implementation. So we define it here. */
-# ifndef SA_RESTORER
-# define SA_RESTORER 0x04000000
+#ifndef SA_RESTORER
+# ifdef ASM_SA_RESTORER
+# define SA_RESTORER ASM_SA_RESTORER
# endif
#endif
-static const struct xlat sigact_flags[] = {
+/*
+ * Some architectures define SA_RESTORER in their headers,
+ * but do not actually have sa_restorer.
+ *
+ * Some architectures, otherwise, do not define SA_RESTORER in their headers,
+ * but actually have sa_restorer.
+ */
#ifdef SA_RESTORER
- { SA_RESTORER, "SA_RESTORER" },
-#endif
-#ifdef SA_STACK
- { SA_STACK, "SA_STACK" },
-#endif
-#ifdef SA_RESTART
- { SA_RESTART, "SA_RESTART" },
-#endif
-#ifdef SA_INTERRUPT
- { SA_INTERRUPT, "SA_INTERRUPT" },
-#endif
-#ifdef SA_NODEFER
- { SA_NODEFER, "SA_NODEFER" },
-#endif
-#if defined SA_NOMASK && SA_NODEFER != SA_NOMASK
- { SA_NOMASK, "SA_NOMASK" },
-#endif
-#ifdef SA_RESETHAND
- { SA_RESETHAND, "SA_RESETHAND" },
-#endif
-#if defined SA_ONESHOT && SA_ONESHOT != SA_RESETHAND
- { SA_ONESHOT, "SA_ONESHOT" },
-#endif
-#ifdef SA_SIGINFO
- { SA_SIGINFO, "SA_SIGINFO" },
-#endif
-#ifdef SA_RESETHAND
- { SA_RESETHAND, "SA_RESETHAND" },
-#endif
-#ifdef SA_ONSTACK
- { SA_ONSTACK, "SA_ONSTACK" },
-#endif
-#ifdef SA_NODEFER
- { SA_NODEFER, "SA_NODEFER" },
-#endif
-#ifdef SA_NOCLDSTOP
- { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
-#endif
-#ifdef SA_NOCLDWAIT
- { SA_NOCLDWAIT, "SA_NOCLDWAIT" },
-#endif
-#ifdef _SA_BSDCALL
- { _SA_BSDCALL, "_SA_BSDCALL" },
-#endif
-#ifdef SA_NOPTRACE
- { SA_NOPTRACE, "SA_NOPTRACE" },
-#endif
- { 0, NULL },
-};
-
-static const struct xlat sigprocmaskcmds[] = {
- { SIG_BLOCK, "SIG_BLOCK" },
- { SIG_UNBLOCK, "SIG_UNBLOCK" },
- { SIG_SETMASK, "SIG_SETMASK" },
-#ifdef SIG_SETMASK32
- { SIG_SETMASK32,"SIG_SETMASK32" },
+# if defined HPPA || defined IA64
+# define HAVE_SA_RESTORER 0
+# else
+# define HAVE_SA_RESTORER 1
+# endif
+#else /* !SA_RESTORER */
+# if defined SPARC || defined SPARC64 || defined M68K
+# define HAVE_SA_RESTORER 1
+# else
+# define HAVE_SA_RESTORER 0
+# endif
#endif
- { 0, NULL },
-};
-#endif /* HAVE_SIGACTION */
+#include "xlat/sigact_flags.h"
+#include "xlat/sigprocmaskcmds.h"
/* Anonymous realtime signals. */
-/* Under glibc 2.1, SIGRTMIN et al are functions, but __SIGRTMIN is a
- constant. This is what we want. Otherwise, just use SIGRTMIN. */
-#ifdef SIGRTMIN
-#ifndef __SIGRTMIN
-#define __SIGRTMIN SIGRTMIN
-#define __SIGRTMAX SIGRTMAX /* likewise */
-#endif
+#ifndef ASM_SIGRTMIN
+/* Linux kernel >= 3.18 defines SIGRTMIN to 32 on all architectures. */
+# define ASM_SIGRTMIN 32
+#endif
+#ifndef ASM_SIGRTMAX
+/* Under glibc 2.1, SIGRTMAX et al are functions, but __SIGRTMAX is a
+ constant. This is what we want. Otherwise, just use SIGRTMAX. */
+# ifdef SIGRTMAX
+# ifndef __SIGRTMAX
+# define __SIGRTMAX SIGRTMAX
+# endif
+# endif
+# ifdef __SIGRTMAX
+# define ASM_SIGRTMAX __SIGRTMAX
+# endif
#endif
/* Note on the size of sigset_t:
*/
const char *
-signame(int sig)
+signame(const int sig)
{
- static char buf[sizeof("SIGRT_%d") + sizeof(int)*3];
-
- if (sig >= 0 && sig < nsignals)
- return signalent[sig];
-#ifdef SIGRTMIN
- if (sig >= __SIGRTMIN && sig <= __SIGRTMAX) {
- sprintf(buf, "SIGRT_%d", (int)(sig - __SIGRTMIN));
- return buf;
- }
+ static char buf[sizeof("SIGRT_%u") + sizeof(int)*3];
+
+ if (sig >= 0) {
+ const unsigned int s = sig;
+
+ if (s < nsignals)
+ return signalent[s];
+#ifdef ASM_SIGRTMAX
+ if (s >= ASM_SIGRTMIN && s <= ASM_SIGRTMAX) {
+ sprintf(buf, "SIGRT_%u", s - ASM_SIGRTMIN);
+ return buf;
+ }
#endif
+ }
sprintf(buf, "%d", sig);
return buf;
}
-static const char *
-sprintsigmask(const char *str, sigset_t *mask, int rt)
-/* set might include realtime sigs */
+static unsigned int
+popcount32(const uint32_t *a, unsigned int size)
{
- /* Was [8 * sizeof(sigset_t) * 8], but
- * glibc sigset_t is huge (1024 bits = 128 *bytes*),
- * and we were ending up with 8k (!) buffer here.
- *
- * No Unix system can have sig > 255
- * (waitpid API won't be able to indicate death from one)
- * and sig 0 doesn't exist either.
- * Therefore max possible no of sigs is 255: 1..255
- */
- static char outstr[8 * (255 * 2 / 3)];
+ unsigned int count = 0;
- int i, nsigs;
- int maxsigs;
- int show_members;
- char sep;
- char *s;
+ for (; size; ++a, --size) {
+ uint32_t x = *a;
- /* Note: nsignals = ARRAY_SIZE(signalent[]),
- * and that array may not have SIGRTnn.
- */
- maxsigs = nsignals;
-#ifdef __SIGRTMAX
- if (rt)
- maxsigs = __SIGRTMAX + 1; /* instead */
+#ifdef HAVE___BUILTIN_POPCOUNT
+ count += __builtin_popcount(x);
+#else
+ for (; x; ++count)
+ x &= x - 1;
#endif
- s = stpcpy(outstr, str);
- nsigs = 0;
- for (i = 1; i < maxsigs; i++) {
- if (sigismember(mask, i) == 1)
- nsigs++;
}
- /* 1: show mask members, 0: show those which are NOT in mask */
- show_members = (nsigs < nsignals * 2 / 3);
- if (!show_members)
+ return count;
+}
+
+const char *
+sprintsigmask_n(const char *prefix, const void *sig_mask, unsigned int bytes)
+{
+ /*
+ * The maximum number of signal names to be printed is NSIG * 2 / 3.
+ * Most of signal names have length 7,
+ * average length of signal names is less than 7.
+ * The length of prefix string does not exceed 16.
+ */
+ static char outstr[128 + 8 * (NSIG * 2 / 3)];
+
+ char *s;
+ const uint32_t *mask;
+ uint32_t inverted_mask[NSIG / 32];
+ unsigned int size;
+ int i;
+ char sep;
+
+ s = stpcpy(outstr, prefix);
+
+ mask = sig_mask;
+ /* length of signal mask in 4-byte words */
+ size = (bytes >= NSIG / 8) ? NSIG / 32 : (bytes + 3) / 4;
+
+ /* check whether 2/3 or more bits are set */
+ if (popcount32(mask, size) >= size * 32 * 2 / 3) {
+ /* show those signals that are NOT in the mask */
+ unsigned int j;
+ for (j = 0; j < size; ++j)
+ inverted_mask[j] = ~mask[j];
+ mask = inverted_mask;
*s++ = '~';
+ }
sep = '[';
- for (i = 1; i < maxsigs; i++) {
- if (sigismember(mask, i) == show_members) {
- *s++ = sep;
- if (i < nsignals) {
- s = stpcpy(s, signalent[i] + 3);
- }
-#ifdef SIGRTMIN
- else if (i >= __SIGRTMIN && i <= __SIGRTMAX) {
- s += sprintf(s, "RT_%u", i - __SIGRTMIN);
- }
-#endif /* SIGRTMIN */
- else {
- s += sprintf(s, "%u", i);
- }
- sep = ' ';
+ for (i = 0; (i = next_set_bit(mask, i, size * 32)) >= 0; ) {
+ ++i;
+ *s++ = sep;
+ if ((unsigned) i < nsignals) {
+ s = stpcpy(s, signalent[i] + 3);
+ }
+#ifdef ASM_SIGRTMAX
+ else if (i >= ASM_SIGRTMIN && i <= ASM_SIGRTMAX) {
+ s += sprintf(s, "RT_%u", i - ASM_SIGRTMIN);
}
+#endif
+ else {
+ s += sprintf(s, "%u", i);
+ }
+ sep = ' ';
}
if (sep == '[')
*s++ = sep;
return outstr;
}
-static const char *
-sprintsigmask_long(const char *str, long mask)
-{
- sigset_t s;
- sigemptyset(&s);
- *(long *)&s = mask;
- return sprintsigmask(str, &s, /*rt:*/ 1);
-}
+#define sprintsigmask_val(prefix, mask) \
+ sprintsigmask_n((prefix), &(mask), sizeof(mask))
-static void
-printsigmask(sigset_t *mask, int rt)
-{
- tprints(sprintsigmask("", mask, rt));
-}
+#define tprintsigmask_val(prefix, mask) \
+ tprints(sprintsigmask_n((prefix), &(mask), sizeof(mask)))
void
printsignal(int nr)
void
print_sigset_addr_len(struct tcb *tcp, long addr, long len)
{
- sigset_t ss;
+ char mask[NSIG / 8];
- if (!addr) {
- tprints("NULL");
- return;
- }
/* Here len is usually equals NSIG / 8 or current_wordsize.
* But we code this defensively:
*/
if (len < 0) {
- bad:
- tprintf("%#lx", addr);
+ printaddr(addr);
return;
}
- if (len > NSIG / 8)
+ if (len >= NSIG / 8)
len = NSIG / 8;
- sigemptyset(&ss);
- if (umoven(tcp, addr, len, (char *)&ss) < 0)
- goto bad;
- printsigmask(&ss, /*rt:*/ 1);
-}
-
-#ifndef ILL_ILLOPC
-#define ILL_ILLOPC 1 /* illegal opcode */
-#define ILL_ILLOPN 2 /* illegal operand */
-#define ILL_ILLADR 3 /* illegal addressing mode */
-#define ILL_ILLTRP 4 /* illegal trap */
-#define ILL_PRVOPC 5 /* privileged opcode */
-#define ILL_PRVREG 6 /* privileged register */
-#define ILL_COPROC 7 /* coprocessor error */
-#define ILL_BADSTK 8 /* internal stack error */
-#define FPE_INTDIV 1 /* integer divide by zero */
-#define FPE_INTOVF 2 /* integer overflow */
-#define FPE_FLTDIV 3 /* floating point divide by zero */
-#define FPE_FLTOVF 4 /* floating point overflow */
-#define FPE_FLTUND 5 /* floating point underflow */
-#define FPE_FLTRES 6 /* floating point inexact result */
-#define FPE_FLTINV 7 /* floating point invalid operation */
-#define FPE_FLTSUB 8 /* subscript out of range */
-#define SEGV_MAPERR 1 /* address not mapped to object */
-#define SEGV_ACCERR 2 /* invalid permissions for mapped object */
-#define BUS_ADRALN 1 /* invalid address alignment */
-#define BUS_ADRERR 2 /* non-existant physical address */
-#define BUS_OBJERR 3 /* object specific hardware error */
-#define TRAP_BRKPT 1 /* process breakpoint */
-#define TRAP_TRACE 2 /* process trace trap */
-#define CLD_EXITED 1 /* child has exited */
-#define CLD_KILLED 2 /* child was killed */
-#define CLD_DUMPED 3 /* child terminated abnormally */
-#define CLD_TRAPPED 4 /* traced child has trapped */
-#define CLD_STOPPED 5 /* child has stopped */
-#define CLD_CONTINUED 6 /* stopped child has continued */
-#define POLL_IN 1 /* data input available */
-#define POLL_OUT 2 /* output buffers available */
-#define POLL_MSG 3 /* input message available */
-#define POLL_ERR 4 /* i/o error */
-#define POLL_PRI 5 /* high priority input available */
-#define POLL_HUP 6 /* device disconnected */
-#define SI_KERNEL 0x80 /* sent by kernel */
-#define SI_USER 0 /* sent by kill, sigsend, raise */
-#define SI_QUEUE -1 /* sent by sigqueue */
-#define SI_TIMER -2 /* sent by timer expiration */
-#define SI_MESGQ -3 /* sent by real time mesq state change */
-#define SI_ASYNCIO -4 /* sent by AIO completion */
-#define SI_SIGIO -5 /* sent by SIGIO */
-#define SI_TKILL -6 /* sent by tkill */
-#define SI_ASYNCNL -60 /* sent by asynch name lookup completion */
-#endif
-
-#ifndef SI_FROMUSER
-# define SI_FROMUSER(sip) ((sip)->si_code <= 0)
-#endif
-
-static const struct xlat siginfo_codes[] = {
-#ifdef SI_KERNEL
- { SI_KERNEL, "SI_KERNEL" },
-#endif
-#ifdef SI_USER
- { SI_USER, "SI_USER" },
-#endif
-#ifdef SI_QUEUE
- { SI_QUEUE, "SI_QUEUE" },
-#endif
-#ifdef SI_TIMER
- { SI_TIMER, "SI_TIMER" },
-#endif
-#ifdef SI_MESGQ
- { SI_MESGQ, "SI_MESGQ" },
-#endif
-#ifdef SI_ASYNCIO
- { SI_ASYNCIO, "SI_ASYNCIO" },
-#endif
-#ifdef SI_SIGIO
- { SI_SIGIO, "SI_SIGIO" },
-#endif
-#ifdef SI_TKILL
- { SI_TKILL, "SI_TKILL" },
-#endif
-#ifdef SI_ASYNCNL
- { SI_ASYNCNL, "SI_ASYNCNL" },
-#endif
-#ifdef SI_NOINFO
- { SI_NOINFO, "SI_NOINFO" },
-#endif
-#ifdef SI_LWP
- { SI_LWP, "SI_LWP" },
-#endif
- { 0, NULL },
-};
-
-static const struct xlat sigill_codes[] = {
- { ILL_ILLOPC, "ILL_ILLOPC" },
- { ILL_ILLOPN, "ILL_ILLOPN" },
- { ILL_ILLADR, "ILL_ILLADR" },
- { ILL_ILLTRP, "ILL_ILLTRP" },
- { ILL_PRVOPC, "ILL_PRVOPC" },
- { ILL_PRVREG, "ILL_PRVREG" },
- { ILL_COPROC, "ILL_COPROC" },
- { ILL_BADSTK, "ILL_BADSTK" },
- { 0, NULL },
-};
-
-static const struct xlat sigfpe_codes[] = {
- { FPE_INTDIV, "FPE_INTDIV" },
- { FPE_INTOVF, "FPE_INTOVF" },
- { FPE_FLTDIV, "FPE_FLTDIV" },
- { FPE_FLTOVF, "FPE_FLTOVF" },
- { FPE_FLTUND, "FPE_FLTUND" },
- { FPE_FLTRES, "FPE_FLTRES" },
- { FPE_FLTINV, "FPE_FLTINV" },
- { FPE_FLTSUB, "FPE_FLTSUB" },
- { 0, NULL },
-};
-
-static const struct xlat sigtrap_codes[] = {
- { TRAP_BRKPT, "TRAP_BRKPT" },
- { TRAP_TRACE, "TRAP_TRACE" },
- { 0, NULL },
-};
-
-static const struct xlat sigchld_codes[] = {
- { CLD_EXITED, "CLD_EXITED" },
- { CLD_KILLED, "CLD_KILLED" },
- { CLD_DUMPED, "CLD_DUMPED" },
- { CLD_TRAPPED, "CLD_TRAPPED" },
- { CLD_STOPPED, "CLD_STOPPED" },
- { CLD_CONTINUED,"CLD_CONTINUED" },
- { 0, NULL },
-};
-
-static const struct xlat sigpoll_codes[] = {
- { POLL_IN, "POLL_IN" },
- { POLL_OUT, "POLL_OUT" },
- { POLL_MSG, "POLL_MSG" },
- { POLL_ERR, "POLL_ERR" },
- { POLL_PRI, "POLL_PRI" },
- { POLL_HUP, "POLL_HUP" },
- { 0, NULL },
-};
-
-static const struct xlat sigprof_codes[] = {
-#ifdef PROF_SIG
- { PROF_SIG, "PROF_SIG" },
-#endif
- { 0, NULL },
-};
-
-#ifdef SIGEMT
-static const struct xlat sigemt_codes[] = {
-#ifdef EMT_TAGOVF
- { EMT_TAGOVF, "EMT_TAGOVF" },
-#endif
- { 0, NULL },
-};
-#endif
-
-static const struct xlat sigsegv_codes[] = {
- { SEGV_MAPERR, "SEGV_MAPERR" },
- { SEGV_ACCERR, "SEGV_ACCERR" },
- { 0, NULL },
-};
-
-static const struct xlat sigbus_codes[] = {
- { BUS_ADRALN, "BUS_ADRALN" },
- { BUS_ADRERR, "BUS_ADRERR" },
- { BUS_OBJERR, "BUS_OBJERR" },
- { 0, NULL },
-};
-
-void
-printsiginfo(siginfo_t *sip, int verbose)
-{
- const char *code;
-
- if (sip->si_signo == 0) {
- tprints("{}");
- return;
- }
- tprints("{si_signo=");
- printsignal(sip->si_signo);
- code = xlookup(siginfo_codes, sip->si_code);
- if (!code) {
- switch (sip->si_signo) {
- case SIGTRAP:
- code = xlookup(sigtrap_codes, sip->si_code);
- break;
- case SIGCHLD:
- code = xlookup(sigchld_codes, sip->si_code);
- break;
- case SIGPOLL:
- code = xlookup(sigpoll_codes, sip->si_code);
- break;
- case SIGPROF:
- code = xlookup(sigprof_codes, sip->si_code);
- break;
- case SIGILL:
- code = xlookup(sigill_codes, sip->si_code);
- break;
-#ifdef SIGEMT
- case SIGEMT:
- code = xlookup(sigemt_codes, sip->si_code);
- break;
-#endif
- case SIGFPE:
- code = xlookup(sigfpe_codes, sip->si_code);
- break;
- case SIGSEGV:
- code = xlookup(sigsegv_codes, sip->si_code);
- break;
- case SIGBUS:
- code = xlookup(sigbus_codes, sip->si_code);
- break;
- }
- }
- if (code)
- tprintf(", si_code=%s", code);
else
- tprintf(", si_code=%#x", sip->si_code);
-#ifdef SI_NOINFO
- if (sip->si_code != SI_NOINFO)
-#endif
- {
- if (sip->si_errno) {
- if (sip->si_errno < 0 || sip->si_errno >= nerrnos)
- tprintf(", si_errno=%d", sip->si_errno);
- else
- tprintf(", si_errno=%s",
- errnoent[sip->si_errno]);
- }
-#ifdef SI_FROMUSER
- if (SI_FROMUSER(sip)) {
- tprintf(", si_pid=%lu, si_uid=%lu",
- (unsigned long) sip->si_pid,
- (unsigned long) sip->si_uid);
- switch (sip->si_code) {
-#ifdef SI_USER
- case SI_USER:
- break;
-#endif
-#ifdef SI_TKILL
- case SI_TKILL:
- break;
-#endif
-#ifdef SI_TIMER
- case SI_TIMER:
- tprintf(", si_value=%d", sip->si_int);
- break;
-#endif
- default:
- if (!sip->si_ptr)
- break;
- if (!verbose)
- tprints(", ...");
- else
- tprintf(", si_value={int=%u, ptr=%#lx}",
- sip->si_int,
- (unsigned long) sip->si_ptr);
- break;
- }
- }
- else
-#endif /* SI_FROMUSER */
- {
- switch (sip->si_signo) {
- case SIGCHLD:
- tprintf(", si_pid=%ld, si_status=",
- (long) sip->si_pid);
- if (sip->si_code == CLD_EXITED)
- tprintf("%d", sip->si_status);
- else
- printsignal(sip->si_status);
- if (!verbose)
- tprints(", ...");
- else
- tprintf(", si_utime=%llu, si_stime=%llu",
- (unsigned long long) sip->si_utime,
- (unsigned long long) sip->si_stime);
- break;
- case SIGILL: case SIGFPE:
- case SIGSEGV: case SIGBUS:
- tprintf(", si_addr=%#lx",
- (unsigned long) sip->si_addr);
- break;
- case SIGPOLL:
- switch (sip->si_code) {
- case POLL_IN: case POLL_OUT: case POLL_MSG:
- tprintf(", si_band=%ld",
- (long) sip->si_band);
- break;
- }
- break;
- default:
- if (sip->si_pid || sip->si_uid)
- tprintf(", si_pid=%lu, si_uid=%lu",
- (unsigned long) sip->si_pid,
- (unsigned long) sip->si_uid);
- if (!sip->si_ptr)
- break;
- if (!verbose)
- tprints(", ...");
- else {
- tprintf(", si_value={int=%u, ptr=%#lx}",
- sip->si_int,
- (unsigned long) sip->si_ptr);
- }
-
- }
- }
- }
- tprints("}");
-}
+ len = (len + 3) & ~3;
-void
-printsiginfo_at(struct tcb *tcp, long addr)
-{
- siginfo_t si;
- if (!addr) {
- tprints("NULL");
- return;
- }
- if (syserror(tcp)) {
- tprintf("%#lx", addr);
- return;
- }
- if (umove(tcp, addr, &si) < 0) {
- tprints("{???}");
+ if (umoven_or_printaddr(tcp, addr, len, mask))
return;
- }
- printsiginfo(&si, verbose(tcp));
+ tprints(sprintsigmask_n("", mask, len));
}
-int
-sys_sigsetmask(struct tcb *tcp)
+SYS_FUNC(sigsetmask)
{
if (entering(tcp)) {
- tprints(sprintsigmask_long("", tcp->u_arg[0]));
+ tprintsigmask_val("", tcp->u_arg[0]);
}
else if (!syserror(tcp)) {
- tcp->auxstr = sprintsigmask_long("old mask ", tcp->u_rval);
+ tcp->auxstr = sprintsigmask_val("old mask ", tcp->u_rval);
return RVAL_HEX | RVAL_STR;
}
return 0;
struct old_sigaction {
/* sa_handler may be a libc #define, need to use other name: */
+#ifdef MIPS
+ unsigned int sa_flags;
+ void (*__sa_handler)(int);
+ /* Kernel treats sa_mask as an array of longs. */
+ unsigned long sa_mask[NSIG / sizeof(long) ? NSIG / sizeof(long) : 1];
+#else
void (*__sa_handler)(int);
unsigned long sa_mask;
unsigned long sa_flags;
+#endif /* !MIPS */
+#if HAVE_SA_RESTORER
void (*sa_restorer)(void);
+#endif
};
-int
-sys_sigaction(struct tcb *tcp)
+struct old_sigaction32 {
+ /* sa_handler may be a libc #define, need to use other name: */
+ uint32_t __sa_handler;
+ uint32_t sa_mask;
+ uint32_t sa_flags;
+#if HAVE_SA_RESTORER
+ uint32_t sa_restorer;
+#endif
+};
+
+static void
+decode_old_sigaction(struct tcb *tcp, long addr)
{
- long addr;
struct old_sigaction sa;
+#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
+ if (current_wordsize != sizeof(sa.__sa_handler) && current_wordsize == 4) {
+ struct old_sigaction32 sa32;
+
+ if (umove_or_printaddr(tcp, addr, &sa32))
+ return;
+
+ memset(&sa, 0, sizeof(sa));
+ sa.__sa_handler = (void*)(uintptr_t)sa32.__sa_handler;
+ sa.sa_flags = sa32.sa_flags;
+#if HAVE_SA_RESTORER && defined SA_RESTORER
+ sa.sa_restorer = (void*)(uintptr_t)sa32.sa_restorer;
+#endif
+ sa.sa_mask = sa32.sa_mask;
+ } else
+#endif
+ if (umove_or_printaddr(tcp, addr, &sa))
+ return;
+
+ /* Architectures using function pointers, like
+ * hppa, may need to manipulate the function pointer
+ * to compute the result of a comparison. However,
+ * the __sa_handler function pointer exists only in
+ * the address space of the traced process, and can't
+ * be manipulated by strace. In order to prevent the
+ * compiler from generating code to manipulate
+ * __sa_handler we cast the function pointers to long. */
+ tprints("{");
+ if ((long)sa.__sa_handler == (long)SIG_ERR)
+ tprints("SIG_ERR");
+ else if ((long)sa.__sa_handler == (long)SIG_DFL)
+ tprints("SIG_DFL");
+ else if ((long)sa.__sa_handler == (long)SIG_IGN)
+ tprints("SIG_IGN");
+ else
+ printaddr((long) sa.__sa_handler);
+ tprints(", ");
+#ifdef MIPS
+ tprintsigmask_addr("", sa.sa_mask);
+#else
+ tprintsigmask_val("", sa.sa_mask);
+#endif
+ tprints(", ");
+ printflags(sigact_flags, sa.sa_flags, "SA_???");
+#if HAVE_SA_RESTORER && defined SA_RESTORER
+ if (sa.sa_flags & SA_RESTORER)
+ tprintf(", %p", sa.sa_restorer);
+#endif
+ tprints("}");
+}
+
+SYS_FUNC(sigaction)
+{
if (entering(tcp)) {
printsignal(tcp->u_arg[0]);
tprints(", ");
- addr = tcp->u_arg[1];
- } else
- addr = tcp->u_arg[2];
- if (addr == 0)
- tprints("NULL");
- else if (!verbose(tcp))
- tprintf("%#lx", addr);
- else if (umove(tcp, addr, &sa) < 0)
- tprints("{...}");
- else {
- /* Architectures using function pointers, like
- * hppa, may need to manipulate the function pointer
- * to compute the result of a comparison. However,
- * the __sa_handler function pointer exists only in
- * the address space of the traced process, and can't
- * be manipulated by strace. In order to prevent the
- * compiler from generating code to manipulate
- * __sa_handler we cast the function pointers to long. */
- if ((long)sa.__sa_handler == (long)SIG_ERR)
- tprints("{SIG_ERR, ");
- else if ((long)sa.__sa_handler == (long)SIG_DFL)
- tprints("{SIG_DFL, ");
- else if ((long)sa.__sa_handler == (long)SIG_IGN)
- tprints("{SIG_IGN, ");
- else
- tprintf("{%#lx, ", (long) sa.__sa_handler);
- tprints(sprintsigmask_long("", sa.sa_mask));
+ decode_old_sigaction(tcp, tcp->u_arg[1]);
tprints(", ");
- printflags(sigact_flags, sa.sa_flags, "SA_???");
-#ifdef SA_RESTORER
- if (sa.sa_flags & SA_RESTORER)
- tprintf(", %p", sa.sa_restorer);
-#endif
- tprints("}");
- }
- if (entering(tcp))
- tprints(", ");
- else
- tprintf(", %#lx", (unsigned long) sa.sa_restorer);
+ } else
+ decode_old_sigaction(tcp, tcp->u_arg[2]);
return 0;
}
-int
-sys_signal(struct tcb *tcp)
+SYS_FUNC(signal)
{
if (entering(tcp)) {
printsignal(tcp->u_arg[0]);
tprints("SIG_IGN");
break;
default:
- tprintf("%#lx", tcp->u_arg[1]);
+ printaddr(tcp->u_arg[1]);
}
return 0;
}
#endif /* HAVE_SIGACTION */
-int
-sys_sigreturn(struct tcb *tcp)
-{
-#if defined(ARM)
- if (entering(tcp)) {
- struct arm_sigcontext {
- unsigned long trap_no;
- unsigned long error_code;
- unsigned long oldmask;
- unsigned long arm_r0;
- unsigned long arm_r1;
- unsigned long arm_r2;
- unsigned long arm_r3;
- unsigned long arm_r4;
- unsigned long arm_r5;
- unsigned long arm_r6;
- unsigned long arm_r7;
- unsigned long arm_r8;
- unsigned long arm_r9;
- unsigned long arm_r10;
- unsigned long arm_fp;
- unsigned long arm_ip;
- unsigned long arm_sp;
- unsigned long arm_lr;
- unsigned long arm_pc;
- unsigned long arm_cpsr;
- unsigned long fault_address;
- };
- struct arm_ucontext {
- unsigned long uc_flags;
- unsigned long uc_link; /* struct ucontext* */
- /* The next three members comprise stack_t struct: */
- unsigned long ss_sp; /* void* */
- unsigned long ss_flags; /* int */
- unsigned long ss_size; /* size_t */
- struct arm_sigcontext sc;
- /* These two members are sigset_t: */
- unsigned long uc_sigmask[2];
- /* more fields follow, which we aren't interested in */
- };
- struct arm_ucontext uc;
- sigset_t sigm;
- if (umove(tcp, arm_regs.ARM_sp, &uc) < 0)
- return 0;
- /* Kernel fills out uc.sc.oldmask too when it sets up signal stack,
- * but for sigmask restore, sigreturn syscall uses uc.uc_sigmask instead.
- * tprints(sprintsigmask_long(") (mask ", uc.sc.oldmask));
- */
- sigemptyset(&sigm);
- ((uint32_t*)&sigm)[0] = uc.uc_sigmask[0];
- ((uint32_t*)&sigm)[1] = uc.uc_sigmask[1];
- tprints(sprintsigmask(") (mask ", &sigm, /*rt:*/ 1));
- }
-#elif defined(S390) || defined(S390X)
- if (entering(tcp)) {
- long usp;
- struct sigcontext_struct sc;
- if (upeek(tcp->pid, PT_GPR15, &usp) < 0)
- return 0;
- if (umove(tcp, usp + __SIGNAL_FRAMESIZE, &sc) < 0)
- return 0;
- tprints(sprintsigmask(") (mask ", (sigset_t *)&sc.oldmask[0], 0));
- }
-#elif defined(I386) || defined(X86_64)
-# if defined(X86_64)
- if (current_personality == 0) /* 64-bit */
- return 0;
-# endif
- if (entering(tcp)) {
- struct i386_sigcontext_struct {
- uint16_t gs, __gsh;
- uint16_t fs, __fsh;
- uint16_t es, __esh;
- uint16_t ds, __dsh;
- uint32_t edi;
- uint32_t esi;
- uint32_t ebp;
- uint32_t esp;
- uint32_t ebx;
- uint32_t edx;
- uint32_t ecx;
- uint32_t eax;
- uint32_t trapno;
- uint32_t err;
- uint32_t eip;
- uint16_t cs, __csh;
- uint32_t eflags;
- uint32_t esp_at_signal;
- uint16_t ss, __ssh;
- uint32_t i387;
- uint32_t oldmask;
- uint32_t cr2;
- };
- struct i386_fpstate {
- uint32_t cw;
- uint32_t sw;
- uint32_t tag;
- uint32_t ipoff;
- uint32_t cssel;
- uint32_t dataoff;
- uint32_t datasel;
- uint8_t st[8][10]; /* 8*10 bytes: FP regs */
- uint16_t status;
- uint16_t magic;
- uint32_t fxsr_env[6];
- uint32_t mxcsr;
- uint32_t reserved;
- uint8_t stx[8][16]; /* 8*16 bytes: FP regs, each padded to 16 bytes */
- uint8_t xmm[8][16]; /* 8 XMM regs */
- uint32_t padding1[44];
- uint32_t padding2[12]; /* union with struct _fpx_sw_bytes */
- };
- struct {
- struct i386_sigcontext_struct sc;
- struct i386_fpstate fp;
- uint32_t extramask[1];
- } signal_stack;
- /* On i386, sc is followed on stack by struct fpstate
- * and after it an additional u32 extramask[1] which holds
- * upper half of the mask.
- */
- sigset_t sigm;
- if (umove(tcp, *i386_esp_ptr, &signal_stack) < 0)
- return 0;
- sigemptyset(&sigm);
- ((uint32_t*)&sigm)[0] = signal_stack.sc.oldmask;
- ((uint32_t*)&sigm)[1] = signal_stack.extramask[0];
- tprints(sprintsigmask(") (mask ", &sigm, /*RT sigs too?:*/ 1));
- }
-#elif defined(IA64)
- if (entering(tcp)) {
- struct sigcontext sc;
- long sp;
- sigset_t sigm;
- /* offset of sigcontext in the kernel's sigframe structure: */
-# define SIGFRAME_SC_OFFSET 0x90
- if (upeek(tcp->pid, PT_R12, &sp) < 0)
- return 0;
- if (umove(tcp, sp + 16 + SIGFRAME_SC_OFFSET, &sc) < 0)
- return 0;
- sigemptyset(&sigm);
- memcpy(&sigm, &sc.sc_mask, NSIG / 8);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
- }
-#elif defined(POWERPC)
- if (entering(tcp)) {
- long esp;
- struct sigcontext_struct sc;
-
- esp = ppc_regs.gpr[1];
-
- /* Skip dummy stack frame. */
-#ifdef POWERPC64
- if (current_personality == 0)
- esp += 128;
- else
- esp += 64;
-#else
- esp += 64;
-#endif
- if (umove(tcp, esp, &sc) < 0)
- return 0;
- tprints(sprintsigmask_long(") (mask ", sc.oldmask));
- }
-#elif defined(M68K)
- if (entering(tcp)) {
- long usp;
- struct sigcontext sc;
- if (upeek(tcp->pid, 4*PT_USP, &usp) < 0)
- return 0;
- if (umove(tcp, usp, &sc) < 0)
- return 0;
- tprints(sprintsigmask_long(") (mask ", sc.sc_mask));
- }
-#elif defined(ALPHA)
- if (entering(tcp)) {
- long fp;
- struct sigcontext_struct sc;
- if (upeek(tcp->pid, REG_FP, &fp) < 0)
- return 0;
- if (umove(tcp, fp, &sc) < 0)
- return 0;
- tprints(sprintsigmask_long(") (mask ", sc.sc_mask));
- }
-#elif defined(SPARC) || defined(SPARC64)
- if (entering(tcp)) {
- long i1;
- m_siginfo_t si;
- i1 = sparc_regs.u_regs[U_REG_O1];
- if (umove(tcp, i1, &si) < 0) {
- perror_msg("sigreturn: umove");
- return 0;
- }
- tprints(sprintsigmask_long(") (mask ", si.si_mask));
- }
-#elif defined(LINUX_MIPSN32) || defined(LINUX_MIPSN64)
- /* This decodes rt_sigreturn. The 64-bit ABIs do not have
- sigreturn. */
- if (entering(tcp)) {
- long sp;
- struct ucontext uc;
- sigset_t sigm;
- if (upeek(tcp->pid, REG_SP, &sp) < 0)
- return 0;
- /* There are six words followed by a 128-byte siginfo. */
- sp = sp + 6 * 4 + 128;
- if (umove(tcp, sp, &uc) < 0)
- return 0;
- tprints(sprintsigmask_long(") (mask ", *(long *) &uc.uc_sigmask));
- }
-#elif defined(MIPS)
- if (entering(tcp)) {
- long sp;
- struct pt_regs regs;
- m_siginfo_t si;
- if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)®s, 0) < 0) {
- perror_msg("sigreturn: PTRACE_GETREGS");
- return 0;
- }
- sp = regs.regs[29];
- if (umove(tcp, sp, &si) < 0)
- return 0;
- tprints(sprintsigmask_long(") (mask ", si.si_mask));
- }
-#elif defined(CRISV10) || defined(CRISV32)
- if (entering(tcp)) {
- struct sigcontext sc;
- long regs[PT_MAX+1];
- if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, (long)regs) < 0) {
- perror_msg("sigreturn: PTRACE_GETREGS");
- return 0;
- }
- if (umove(tcp, regs[PT_USP], &sc) < 0)
- return 0;
- tprints(sprintsigmask_long(") (mask ", sc.oldmask));
- }
-#elif defined(TILE)
- if (entering(tcp)) {
- struct ucontext uc;
- sigset_t sigm;
-
- /* offset of ucontext in the kernel's sigframe structure */
-# define SIGFRAME_UC_OFFSET C_ABI_SAVE_AREA_SIZE + sizeof(siginfo_t)
- if (umove(tcp, tile_regs.sp + SIGFRAME_UC_OFFSET, &uc) < 0)
- return 0;
- sigemptyset(&sigm);
- memcpy(&sigm, &uc.uc_sigmask, NSIG / 8);
- tprints(sprintsigmask(") (mask ", &sigm, 0));
- }
-#elif defined(MICROBLAZE)
- /* TODO: Verify that this is correct... */
- if (entering(tcp)) {
- struct sigcontext sc;
- long sp;
- /* Read r1, the stack pointer. */
- if (upeek(tcp->pid, 1 * 4, &sp) < 0)
- return 0;
- if (umove(tcp, sp, &sc) < 0)
- return 0;
- tprints(sprintsigmask_long(") (mask ", sc.oldmask));
- }
-#elif defined(XTENSA)
- /* Xtensa only has rt_sys_sigreturn */
-#else
-# warning No sys_sigreturn() for this architecture
-# warning (no problem, just a reminder :-)
-#endif
- return 0;
-}
-
-int
-sys_siggetmask(struct tcb *tcp)
+SYS_FUNC(siggetmask)
{
if (exiting(tcp)) {
- tcp->auxstr = sprintsigmask_long("mask ", tcp->u_rval);
+ tcp->auxstr = sprintsigmask_val("mask ", tcp->u_rval);
}
return RVAL_HEX | RVAL_STR;
}
-int
-sys_sigsuspend(struct tcb *tcp)
-{
- if (entering(tcp)) {
- tprints(sprintsigmask_long("", tcp->u_arg[2]));
- }
- return 0;
-}
-
-#if !defined SS_ONSTACK
-#define SS_ONSTACK 1
-#define SS_DISABLE 2
-#endif
-
-static const struct xlat sigaltstack_flags[] = {
- { SS_ONSTACK, "SS_ONSTACK" },
- { SS_DISABLE, "SS_DISABLE" },
- { 0, NULL },
-};
-
-static void
-print_stack_t(struct tcb *tcp, unsigned long addr)
+SYS_FUNC(sigsuspend)
{
- stack_t ss;
+ tprintsigmask_val("", tcp->u_arg[2]);
- if (!addr) {
- tprints("NULL");
- } else if (umove(tcp, addr, &ss) < 0) {
- tprintf("%#lx", addr);
- } else {
- tprintf("{ss_sp=%#lx, ss_flags=", (unsigned long) ss.ss_sp);
- printflags(sigaltstack_flags, ss.ss_flags, "SS_???");
- tprintf(", ss_size=%lu}", (unsigned long) ss.ss_size);
- }
-}
-
-int
-sys_sigaltstack(struct tcb *tcp)
-{
- if (entering(tcp)) {
- print_stack_t(tcp, tcp->u_arg[0]);
- }
- else {
- tprints(", ");
- print_stack_t(tcp, tcp->u_arg[1]);
- }
- return 0;
+ return RVAL_DECODED;
}
#ifdef HAVE_SIGACTION
/* "Old" sigprocmask, which operates with word-sized signal masks */
-int
-sys_sigprocmask(struct tcb *tcp)
+SYS_FUNC(sigprocmask)
{
# ifdef ALPHA
if (entering(tcp)) {
* ret = sigprocmask(how, &new, &old, ...);
*/
printxval(sigprocmaskcmds, tcp->u_arg[0], "SIG_???");
- tprints(sprintsigmask_long(", ", tcp->u_arg[1]));
+ tprintsigmask_val(", ", tcp->u_arg[1]);
}
else if (!syserror(tcp)) {
- tcp->auxstr = sprintsigmask_long("old mask ", tcp->u_rval);
+ tcp->auxstr = sprintsigmask_val("old mask ", tcp->u_rval);
return RVAL_HEX | RVAL_STR;
}
# else /* !ALPHA */
tprints(", ");
}
else {
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[2]);
- else
- print_sigset_addr_len(tcp, tcp->u_arg[2], current_wordsize);
+ print_sigset_addr_len(tcp, tcp->u_arg[2], current_wordsize);
}
# endif /* !ALPHA */
return 0;
#endif /* HAVE_SIGACTION */
-int
-sys_kill(struct tcb *tcp)
+SYS_FUNC(kill)
{
- if (entering(tcp)) {
- tprintf("%ld, %s",
- widen_to_long(tcp->u_arg[0]),
- signame(tcp->u_arg[1])
- );
- }
- return 0;
+ tprintf("%ld, %s",
+ widen_to_long(tcp->u_arg[0]),
+ signame(tcp->u_arg[1]));
+
+ return RVAL_DECODED;
}
-int
-sys_tgkill(struct tcb *tcp)
+SYS_FUNC(tgkill)
{
- if (entering(tcp)) {
- tprintf("%ld, %ld, %s",
- widen_to_long(tcp->u_arg[0]),
- widen_to_long(tcp->u_arg[1]),
- signame(tcp->u_arg[2])
- );
- }
- return 0;
+ tprintf("%ld, %ld, %s",
+ widen_to_long(tcp->u_arg[0]),
+ widen_to_long(tcp->u_arg[1]),
+ signame(tcp->u_arg[2]));
+
+ return RVAL_DECODED;
}
-int
-sys_sigpending(struct tcb *tcp)
+SYS_FUNC(sigpending)
{
- if (exiting(tcp)) {
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[0]);
- else
- print_sigset_addr_len(tcp, tcp->u_arg[0], current_wordsize);
- }
+ if (exiting(tcp))
+ print_sigset_addr_len(tcp, tcp->u_arg[0], current_wordsize);
return 0;
}
-int
-sys_rt_sigprocmask(struct tcb *tcp)
+SYS_FUNC(rt_sigprocmask)
{
/* Note: arg[3] is the length of the sigset. Kernel requires NSIG / 8 */
if (entering(tcp)) {
tprints(", ");
}
else {
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[2]);
- else
- print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
+ print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
tprintf(", %lu", tcp->u_arg[3]);
}
return 0;
struct new_sigaction
{
/* sa_handler may be a libc #define, need to use other name: */
+#ifdef MIPS
+ unsigned int sa_flags;
+ void (*__sa_handler)(int);
+#else
void (*__sa_handler)(int);
unsigned long sa_flags;
+#endif /* !MIPS */
+#if HAVE_SA_RESTORER
void (*sa_restorer)(void);
+#endif
/* Kernel treats sa_mask as an array of longs. */
unsigned long sa_mask[NSIG / sizeof(long) ? NSIG / sizeof(long) : 1];
};
{
uint32_t __sa_handler;
uint32_t sa_flags;
+#if HAVE_SA_RESTORER
uint32_t sa_restorer;
+#endif
uint32_t sa_mask[2 * (NSIG / sizeof(long) ? NSIG / sizeof(long) : 1)];
};
-int
-sys_rt_sigaction(struct tcb *tcp)
+static void
+decode_new_sigaction(struct tcb *tcp, long addr)
{
struct new_sigaction sa;
- sigset_t sigset;
- long addr;
- int r;
- if (entering(tcp)) {
- printsignal(tcp->u_arg[0]);
- tprints(", ");
- addr = tcp->u_arg[1];
- } else
- addr = tcp->u_arg[2];
-
- if (addr == 0) {
- tprints("NULL");
- goto after_sa;
- }
- if (!verbose(tcp)) {
- tprintf("%#lx", addr);
- goto after_sa;
- }
#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
if (current_wordsize != sizeof(sa.sa_flags) && current_wordsize == 4) {
struct new_sigaction32 sa32;
- r = umove(tcp, addr, &sa32);
- if (r >= 0) {
- memset(&sa, 0, sizeof(sa));
- sa.__sa_handler = (void*)(unsigned long)sa32.__sa_handler;
- sa.sa_flags = sa32.sa_flags;
- sa.sa_restorer = (void*)(unsigned long)sa32.sa_restorer;
- /* Kernel treats sa_mask as an array of longs.
- * For 32-bit process, "long" is uint32_t, thus, for example,
- * 32th bit in sa_mask will end up as bit 0 in sa_mask[1].
- * But for (64-bit) kernel, 32th bit in sa_mask is
- * 32th bit in 0th (64-bit) long!
- * For little-endian, it's the same.
- * For big-endian, we swap 32-bit words.
- */
- sa.sa_mask[0] = sa32.sa_mask[0] + ((long)(sa32.sa_mask[1]) << 32);
- }
+
+ if (umove_or_printaddr(tcp, addr, &sa32))
+ return;
+
+ memset(&sa, 0, sizeof(sa));
+ sa.__sa_handler = (void*)(unsigned long)sa32.__sa_handler;
+ sa.sa_flags = sa32.sa_flags;
+#if HAVE_SA_RESTORER && defined SA_RESTORER
+ sa.sa_restorer = (void*)(unsigned long)sa32.sa_restorer;
+#endif
+ /* Kernel treats sa_mask as an array of longs.
+ * For 32-bit process, "long" is uint32_t, thus, for example,
+ * 32th bit in sa_mask will end up as bit 0 in sa_mask[1].
+ * But for (64-bit) kernel, 32th bit in sa_mask is
+ * 32th bit in 0th (64-bit) long!
+ * For little-endian, it's the same.
+ * For big-endian, we swap 32-bit words.
+ */
+ sa.sa_mask[0] = sa32.sa_mask[0] + ((long)(sa32.sa_mask[1]) << 32);
} else
#endif
- {
- r = umove(tcp, addr, &sa);
- }
- if (r < 0) {
- tprints("{...}");
- goto after_sa;
- }
+ if (umove_or_printaddr(tcp, addr, &sa))
+ return;
+
/* Architectures using function pointers, like
* hppa, may need to manipulate the function pointer
* to compute the result of a comparison. However,
* with wrong sigset size (just returns EINVAL instead).
* We just fetch the right size, which is NSIG / 8.
*/
- sigemptyset(&sigset);
- memcpy(&sigset, &sa.sa_mask, NSIG / 8);
- printsigmask(&sigset, /*rt:*/ 1);
+ tprintsigmask_val("", sa.sa_mask);
tprints(", ");
printflags(sigact_flags, sa.sa_flags, "SA_???");
-#ifdef SA_RESTORER
+#if HAVE_SA_RESTORER && defined SA_RESTORER
if (sa.sa_flags & SA_RESTORER)
tprintf(", %p", sa.sa_restorer);
#endif
tprints("}");
+}
- after_sa:
- if (entering(tcp))
+SYS_FUNC(rt_sigaction)
+{
+ if (entering(tcp)) {
+ printsignal(tcp->u_arg[0]);
tprints(", ");
- else
+ decode_new_sigaction(tcp, tcp->u_arg[1]);
+ tprints(", ");
+ } else {
+ decode_new_sigaction(tcp, tcp->u_arg[2]);
#if defined(SPARC) || defined(SPARC64)
tprintf(", %#lx, %lu", tcp->u_arg[3], tcp->u_arg[4]);
#elif defined(ALPHA)
#else
tprintf(", %lu", tcp->u_arg[3]);
#endif
+ }
return 0;
}
-int
-sys_rt_sigpending(struct tcb *tcp)
+SYS_FUNC(rt_sigpending)
{
if (exiting(tcp)) {
/*
* This allows non-rt sigpending() syscall
* to reuse rt_sigpending() code in kernel.
*/
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[0]);
- else
- print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[1]);
+ print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[1]);
tprintf(", %lu", tcp->u_arg[1]);
}
return 0;
}
-int
-sys_rt_sigsuspend(struct tcb *tcp)
+SYS_FUNC(rt_sigsuspend)
{
- if (entering(tcp)) {
- /* NB: kernel requires arg[1] == NSIG / 8 */
- print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[1]);
- tprintf(", %lu", tcp->u_arg[1]);
- }
- return 0;
+ /* NB: kernel requires arg[1] == NSIG / 8 */
+ print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[1]);
+ tprintf(", %lu", tcp->u_arg[1]);
+
+ return RVAL_DECODED;
}
static void
printsiginfo_at(tcp, uinfo);
}
-int
-sys_rt_sigqueueinfo(struct tcb *tcp)
+SYS_FUNC(rt_sigqueueinfo)
{
- if (entering(tcp)) {
- tprintf("%lu, ", tcp->u_arg[0]);
- print_sigqueueinfo(tcp, tcp->u_arg[1], tcp->u_arg[2]);
- }
- return 0;
+ tprintf("%lu, ", tcp->u_arg[0]);
+ print_sigqueueinfo(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+
+ return RVAL_DECODED;
}
-int
-sys_rt_tgsigqueueinfo(struct tcb *tcp)
+SYS_FUNC(rt_tgsigqueueinfo)
{
- if (entering(tcp)) {
- tprintf("%lu, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
- print_sigqueueinfo(tcp, tcp->u_arg[2], tcp->u_arg[3]);
- }
- return 0;
+ tprintf("%lu, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
+ print_sigqueueinfo(tcp, tcp->u_arg[2], tcp->u_arg[3]);
+
+ return RVAL_DECODED;
}
-int sys_rt_sigtimedwait(struct tcb *tcp)
+SYS_FUNC(rt_sigtimedwait)
{
/* NB: kernel requires arg[3] == NSIG / 8 */
if (entering(tcp)) {
/* syscall exit, and u_arg[1] was NULL */
return 0;
}
+
+ /*
+ * Since the timeout parameter is read by the kernel
+ * on entering syscall, it has to be decoded the same way
+ * whether the syscall has failed or not.
+ */
+ temporarily_clear_syserror(tcp);
print_timespec(tcp, tcp->u_arg[2]);
+ restore_cleared_syserror(tcp);
+
tprintf(", %lu", tcp->u_arg[3]);
return 0;
};
-int
-sys_restart_syscall(struct tcb *tcp)
-{
- if (entering(tcp))
- tprints("<... resuming interrupted call ...>");
- return 0;
-}
-
-static int
-do_signalfd(struct tcb *tcp, int flags_arg)
+SYS_FUNC(restart_syscall)
{
- /* NB: kernel requires arg[2] == NSIG / 8 */
- if (entering(tcp)) {
- printfd(tcp, tcp->u_arg[0]);
- tprints(", ");
- print_sigset_addr_len(tcp, tcp->u_arg[1], tcp->u_arg[2]);
- tprintf(", %lu", tcp->u_arg[2]);
- if (flags_arg >= 0) {
- tprints(", ");
- printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
- }
- }
- return 0;
-}
+ tprintf("<... resuming interrupted %s ...>",
+ tcp->s_prev_ent ? tcp->s_prev_ent->sys_name : "system call");
-int
-sys_signalfd(struct tcb *tcp)
-{
- return do_signalfd(tcp, -1);
-}
-
-int
-sys_signalfd4(struct tcb *tcp)
-{
- return do_signalfd(tcp, 3);
+ return RVAL_DECODED;
}