]> granicus.if.org Git - strace/blobdiff - signal.c
Use printnum_int64 instead of print_loff_t
[strace] / signal.c
index 710fb19b158361f4cfebbcd01777f699ee6e3ac8..e0f2a70baee34f17e07368846d62fe1f7b89b091 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -32,6 +32,7 @@
  */
 
 #include "defs.h"
+#include <signal.h>
 
 #ifndef NSIG
 # warning NSIG is not defined, using 32
@@ -62,7 +63,7 @@
 #  define HAVE_SA_RESTORER 1
 # endif
 #else /* !SA_RESTORER */
-# if defined SPARC || defined SPARC64
+# if defined SPARC || defined SPARC64 || defined M68K
 #  define HAVE_SA_RESTORER 1
 # else
 #  define HAVE_SA_RESTORER 0
@@ -227,16 +228,11 @@ print_sigset_addr_len(struct tcb *tcp, long addr, long len)
 {
        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)
@@ -244,265 +240,12 @@ print_sigset_addr_len(struct tcb *tcp, long addr, long len)
        else
                len = (len + 3) & ~3;
 
-       if (umoven(tcp, addr, len, mask) < 0)
-               goto bad;
-       tprints(sprintsigmask_n("", mask, len));
-}
-
-#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 SYS_SECCOMP     1       /* seccomp triggered */
-#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_DETHREAD    -7      /* sent by execve killing subsidiary threads */
-#define SI_ASYNCNL     -60     /* sent by asynch name lookup completion */
-#endif
-
-#ifndef SI_FROMUSER
-# define SI_FROMUSER(sip)      ((sip)->si_code <= 0)
-#endif
-
-#include "xlat/siginfo_codes.h"
-#include "xlat/sigill_codes.h"
-#include "xlat/sigfpe_codes.h"
-#include "xlat/sigtrap_codes.h"
-#include "xlat/sigchld_codes.h"
-#include "xlat/sigpoll_codes.h"
-#include "xlat/sigprof_codes.h"
-
-#ifdef SIGEMT
-#include "xlat/sigemt_codes.h"
-#endif
-
-#include "xlat/sigsegv_codes.h"
-#include "xlat/sigbus_codes.h"
-
-#ifndef SYS_SECCOMP
-# define SYS_SECCOMP 1
-#endif
-#include "xlat/sigsys_codes.h"
-
-static void
-printsigsource(const siginfo_t *sip)
-{
-       tprintf(", si_pid=%lu, si_uid=%lu",
-               (unsigned long) sip->si_pid,
-               (unsigned long) sip->si_uid);
-}
-
-static void
-printsigval(const siginfo_t *sip, int verbose)
-{
-       if (!verbose)
-               tprints(", ...");
-       else
-               tprintf(", si_value={int=%u, ptr=%#lx}",
-                       sip->si_int,
-                       (unsigned long) sip->si_ptr);
-}
-
-void
-printsiginfo(const 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;
-               case SIGSYS:
-                       code = xlookup(sigsys_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) {
-                       tprints(", si_errno=");
-                       if ((unsigned) sip->si_errno < nerrnos
-                           && errnoent[sip->si_errno])
-                               tprints(errnoent[sip->si_errno]);
-                       else
-                               tprintf("%d", sip->si_errno);
-               }
-#ifdef SI_FROMUSER
-               if (SI_FROMUSER(sip)) {
-                       switch (sip->si_code) {
-#ifdef SI_USER
-                       case SI_USER:
-                               printsigsource(sip);
-                               break;
-#endif
-#ifdef SI_TKILL
-                       case SI_TKILL:
-                               printsigsource(sip);
-                               break;
-#endif
-#if defined SI_TIMER \
- && defined HAVE_SIGINFO_T_SI_TIMERID && defined HAVE_SIGINFO_T_SI_OVERRUN
-                       case SI_TIMER:
-                               tprintf(", si_timerid=%#x, si_overrun=%d",
-                                       sip->si_timerid, sip->si_overrun);
-                               printsigval(sip, verbose);
-                               break;
-#endif
-                       default:
-                               printsigsource(sip);
-                               if (sip->si_ptr)
-                                       printsigval(sip, verbose);
-                               break;
-                       }
-               }
-               else
-#endif /* SI_FROMUSER */
-               {
-                       switch (sip->si_signo) {
-                       case SIGCHLD:
-                               printsigsource(sip);
-                               tprints(", si_status=");
-                               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;
-#ifdef HAVE_SIGINFO_T_SI_SYSCALL
-                       case SIGSYS:
-                               tprintf(", si_call_addr=%#lx, si_syscall=%d, si_arch=%u",
-                                       (unsigned long) sip->si_call_addr,
-                                       sip->si_syscall, sip->si_arch);
-                               break;
-#endif
-                       default:
-                               if (sip->si_pid || sip->si_uid)
-                                       printsigsource(sip);
-                               if (sip->si_ptr)
-                                       printsigval(sip, verbose);
-                       }
-               }
-       }
-       tprints("}");
-}
-
-void
-printsiginfo_at(struct tcb *tcp, long addr)
-{
-       siginfo_t si;
-       if (!addr) {
-               tprints("NULL");
+       if (umoven_or_printaddr(tcp, addr, len, mask))
                return;
-       }
-       if (syserror(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-       if (umove(tcp, addr, &si) < 0) {
-               tprints("{???}");
-               return;
-       }
-       printsiginfo(&si, verbose(tcp));
+       tprints(sprintsigmask_n("", mask, len));
 }
 
-int
-sys_sigsetmask(struct tcb *tcp)
+SYS_FUNC(sigsetmask)
 {
        if (entering(tcp)) {
                tprintsigmask_val("", tcp->u_arg[0]);
@@ -547,39 +290,25 @@ static void
 decode_old_sigaction(struct tcb *tcp, long addr)
 {
        struct old_sigaction sa;
-       int r;
-
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (!verbose(tcp) || (exiting(tcp) && syserror(tcp))) {
-               tprintf("%#lx", addr);
-               return;
-       }
 
 #if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
        if (current_wordsize != sizeof(sa.__sa_handler) && current_wordsize == 4) {
                struct old_sigaction32 sa32;
-               r = umove(tcp, addr, &sa32);
-               if (r >= 0) {
-                       memset(&sa, 0, sizeof(sa));
-                       sa.__sa_handler = (void*)(uintptr_t)sa32.__sa_handler;
-                       sa.sa_flags = sa32.sa_flags;
+
+               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;
+               sa.sa_restorer = (void*)(uintptr_t)sa32.sa_restorer;
 #endif
-                       sa.sa_mask = sa32.sa_mask;
-               }
+               sa.sa_mask = sa32.sa_mask;
        } else
 #endif
-       {
-               r = umove(tcp, addr, &sa);
-       }
-       if (r < 0) {
-               tprints("{...}");
+       if (umove_or_printaddr(tcp, addr, &sa))
                return;
-       }
 
        /* Architectures using function pointers, like
         * hppa, may need to manipulate the function pointer
@@ -589,14 +318,16 @@ decode_old_sigaction(struct tcb *tcp, long addr)
         * 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, ");
+               tprints("SIG_ERR");
        else if ((long)sa.__sa_handler == (long)SIG_DFL)
-               tprints("{SIG_DFL, ");
+               tprints("SIG_DFL");
        else if ((long)sa.__sa_handler == (long)SIG_IGN)
-               tprints("{SIG_IGN, ");
+               tprints("SIG_IGN");
        else
-               tprintf("{%#lx, ", (long) sa.__sa_handler);
+               printaddr((long) sa.__sa_handler);
+       tprints(", ");
 #ifdef MIPS
        tprintsigmask_addr("", sa.sa_mask);
 #else
@@ -611,8 +342,7 @@ decode_old_sigaction(struct tcb *tcp, long addr)
        tprints("}");
 }
 
-int
-sys_sigaction(struct tcb *tcp)
+SYS_FUNC(sigaction)
 {
        if (entering(tcp)) {
                printsignal(tcp->u_arg[0]);
@@ -624,8 +354,7 @@ sys_sigaction(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_signal(struct tcb *tcp)
+SYS_FUNC(signal)
 {
        if (entering(tcp)) {
                printsignal(tcp->u_arg[0]);
@@ -641,7 +370,7 @@ sys_signal(struct tcb *tcp)
                        tprints("SIG_IGN");
                        break;
                default:
-                       tprintf("%#lx", tcp->u_arg[1]);
+                       printaddr(tcp->u_arg[1]);
                }
                return 0;
        }
@@ -663,8 +392,7 @@ sys_signal(struct tcb *tcp)
 
 #endif /* HAVE_SIGACTION */
 
-int
-sys_siggetmask(struct tcb *tcp)
+SYS_FUNC(siggetmask)
 {
        if (exiting(tcp)) {
                tcp->auxstr = sprintsigmask_val("mask ", tcp->u_rval);
@@ -672,79 +400,17 @@ sys_siggetmask(struct tcb *tcp)
        return RVAL_HEX | RVAL_STR;
 }
 
-int
-sys_sigsuspend(struct tcb *tcp)
+SYS_FUNC(sigsuspend)
 {
-       if (entering(tcp)) {
-               tprintsigmask_val("", tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-#if !defined SS_ONSTACK
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-#endif
-
-#include "xlat/sigaltstack_flags.h"
-
-static void
-print_stack_t(struct tcb *tcp, unsigned long addr)
-{
-       stack_t ss;
-       int r;
-
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-       if (current_wordsize != sizeof(ss.ss_sp) && current_wordsize == 4) {
-               struct {
-                       uint32_t ss_sp;
-                       int32_t ss_flags;
-                       uint32_t ss_size;
-               } ss32;
-               r = umove(tcp, addr, &ss32);
-               if (r >= 0) {
-                       memset(&ss, 0, sizeof(ss));
-                       ss.ss_sp = (void*)(unsigned long) ss32.ss_sp;
-                       ss.ss_flags = ss32.ss_flags;
-                       ss.ss_size = (unsigned long) ss32.ss_size;
-               }
-       } else
-#endif
-       {
-               r = umove(tcp, addr, &ss);
-       }
-       if (r < 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);
-       }
-}
+       tprintsigmask_val("", tcp->u_arg[2]);
 
-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)) {
@@ -774,10 +440,7 @@ sys_sigprocmask(struct tcb *tcp)
                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;
@@ -785,45 +448,33 @@ sys_sigprocmask(struct tcb *tcp)
 
 #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)) {
@@ -833,10 +484,7 @@ sys_rt_sigprocmask(struct tcb *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;
@@ -874,46 +522,34 @@ static void
 decode_new_sigaction(struct tcb *tcp, long addr)
 {
        struct new_sigaction sa;
-       int r;
 
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (!verbose(tcp) || (exiting(tcp) && syserror(tcp))) {
-               tprintf("%#lx", addr);
-               return;
-       }
 #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;
+
+               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);
-               }
+               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("{...}");
+       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,
@@ -948,8 +584,7 @@ decode_new_sigaction(struct tcb *tcp, long addr)
        tprints("}");
 }
 
-int
-sys_rt_sigaction(struct tcb *tcp)
+SYS_FUNC(rt_sigaction)
 {
        if (entering(tcp)) {
                printsignal(tcp->u_arg[0]);
@@ -969,8 +604,7 @@ sys_rt_sigaction(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_rt_sigpending(struct tcb *tcp)
+SYS_FUNC(rt_sigpending)
 {
        if (exiting(tcp)) {
                /*
@@ -979,24 +613,19 @@ sys_rt_sigpending(struct tcb *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
@@ -1007,27 +636,23 @@ print_sigqueueinfo(struct tcb *tcp, int sig, unsigned long uinfo)
        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)) {
@@ -1053,39 +678,36 @@ int sys_rt_sigtimedwait(struct tcb *tcp)
        return 0;
 };
 
-int
-sys_restart_syscall(struct tcb *tcp)
+SYS_FUNC(restart_syscall)
 {
-       if (entering(tcp))
-               tprints("<... resuming interrupted call ...>");
-       return 0;
+       tprintf("<... resuming interrupted %s ...>",
+               tcp->s_prev_ent ? tcp->s_prev_ent->sys_name : "system call");
+
+       return RVAL_DECODED;
 }
 
 static int
 do_signalfd(struct tcb *tcp, int flags_arg)
 {
        /* NB: kernel requires arg[2] == NSIG / 8 */
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
+       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(", ");
-               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_???");
-               }
+               printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
        }
-       return 0;
+
+       return RVAL_DECODED;
 }
 
-int
-sys_signalfd(struct tcb *tcp)
+SYS_FUNC(signalfd)
 {
        return do_signalfd(tcp, -1);
 }
 
-int
-sys_signalfd4(struct tcb *tcp)
+SYS_FUNC(signalfd4)
 {
        return do_signalfd(tcp, 3);
 }