Simplify print_lld_from_low_high_val ifdefery

[strace] / signal.c

diff --git a/signal.c b/signal.c
index 6a8193b3da28588186b898ceab89ccc64694a650..30838b2347d369f95d3487d03804c19801a7534a 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -115,13 +115,13 @@
  */
 
 static const char *
-get_sa_handler_str(unsigned long handler)
+get_sa_handler_str(kernel_ulong_t handler)
 {
        return xlookup(sa_handler_values, handler);
 }
 
 static void
-print_sa_handler(unsigned long handler)
+print_sa_handler(kernel_ulong_t handler)
 {
        const char *sa_handler_str = get_sa_handler_str(handler);
 
@@ -242,8 +242,8 @@ printsignal(int nr)
 }
 
 static void
-print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ureg_t addr,
-                           const long len, const long min_len)
+print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ulong_t addr,
+                           const kernel_ulong_t len, const unsigned int min_len)
 {
        /*
         * Here len is usually equal to NSIG / 8 or current_wordsize.
@@ -260,8 +260,8 @@ print_sigset_addr_len_limit(struct tcb *const tcp, const kernel_ureg_t addr,
 }
 
 void
-print_sigset_addr_len(struct tcb *const tcp, const kernel_ureg_t addr,
-                     const long len)
+print_sigset_addr_len(struct tcb *const tcp, const kernel_ulong_t addr,
+                     const kernel_ulong_t len)
 {
        print_sigset_addr_len_limit(tcp, addr, len, current_wordsize);
 }
@@ -282,22 +282,22 @@ 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);
+       unsigned long sa_handler__;
        /* 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_handler__;
        unsigned long sa_mask;
        unsigned long sa_flags;
 #endif /* !MIPS */
 #if HAVE_SA_RESTORER
-       void (*sa_restorer)(void);
+       unsigned long sa_restorer;
 #endif
 };
 
 struct old_sigaction32 {
        /* sa_handler may be a libc #define, need to use other name: */
-       uint32_t __sa_handler;
+       uint32_t sa_handler__;
        uint32_t sa_mask;
        uint32_t sa_flags;
 #if HAVE_SA_RESTORER
@@ -306,22 +306,22 @@ struct old_sigaction32 {
 };
 
 static void
-decode_old_sigaction(struct tcb *const tcp, const kernel_ureg_t addr)
+decode_old_sigaction(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct old_sigaction sa;
 
 #if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-       if (current_wordsize != sizeof(sa.__sa_handler) && current_wordsize == 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_handler__ = 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 = sa32.sa_restorer;
 #endif
                sa.sa_mask = sa32.sa_mask;
        } else
@@ -329,16 +329,8 @@ decode_old_sigaction(struct tcb *const tcp, const kernel_ureg_t addr)
        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("{sa_handler=");
-       print_sa_handler((unsigned long) sa.__sa_handler);
+       print_sa_handler(sa.sa_handler__);
        tprints(", sa_mask=");
 #ifdef MIPS
        tprintsigmask_addr("", sa.sa_mask);
@@ -348,8 +340,10 @@ decode_old_sigaction(struct tcb *const tcp, const kernel_ureg_t addr)
        tprints(", sa_flags=");
        printflags(sigact_flags, sa.sa_flags, "SA_???");
 #if HAVE_SA_RESTORER && defined SA_RESTORER
-       if (sa.sa_flags & SA_RESTORER)
-               tprintf(", sa_restorer=%p", sa.sa_restorer);
+       if (sa.sa_flags & SA_RESTORER) {
+               tprints(", sa_restorer=");
+               printaddr(sa.sa_restorer);
+       }
 #endif
        tprints("}");
 }
@@ -469,7 +463,7 @@ SYS_FUNC(rt_sigprocmask)
        }
        else {
                print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
-               tprintf(", %lu", tcp->u_arg[3]);
+               tprintf(", %" PRI_klu, tcp->u_arg[3]);
        }
        return 0;
 }
@@ -480,13 +474,13 @@ 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);
+       unsigned long sa_handler__;
 #else
-       void (*__sa_handler)(int);
+       unsigned long sa_handler__;
        unsigned long sa_flags;
 #endif /* !MIPS */
 #if HAVE_SA_RESTORER
-       void (*sa_restorer)(void);
+       unsigned long sa_restorer;
 #endif
        /* Kernel treats sa_mask as an array of longs. */
        unsigned long sa_mask[NSIG / sizeof(long) ? NSIG / sizeof(long) : 1];
@@ -494,7 +488,7 @@ struct new_sigaction
 /* Same for i386-on-x86_64 and similar cases */
 struct new_sigaction32
 {
-       uint32_t __sa_handler;
+       uint32_t sa_handler__;
        uint32_t sa_flags;
 #if HAVE_SA_RESTORER
        uint32_t sa_restorer;
@@ -503,7 +497,7 @@ struct new_sigaction32
 };
 
 static void
-decode_new_sigaction(struct tcb *const tcp, const kernel_ureg_t addr)
+decode_new_sigaction(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct new_sigaction sa;
 
@@ -515,10 +509,10 @@ decode_new_sigaction(struct tcb *const tcp, const kernel_ureg_t addr)
                        return;
 
                memset(&sa, 0, sizeof(sa));
-               sa.__sa_handler = (void*)(unsigned long)sa32.__sa_handler;
+               sa.sa_handler__ = 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;
+               sa.sa_restorer  = sa32.sa_restorer;
 #endif
                /* Kernel treats sa_mask as an array of longs.
                 * For 32-bit process, "long" is uint32_t, thus, for example,
@@ -534,16 +528,8 @@ decode_new_sigaction(struct tcb *const tcp, const kernel_ureg_t addr)
        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("{sa_handler=");
-       print_sa_handler((unsigned long) sa.__sa_handler);
+       print_sa_handler(sa.sa_handler__);
        tprints(", sa_mask=");
        /*
         * Sigset size is in tcp->u_arg[4] (SPARC)
@@ -557,8 +543,10 @@ decode_new_sigaction(struct tcb *const tcp, const kernel_ureg_t addr)
 
        printflags(sigact_flags, sa.sa_flags, "SA_???");
 #if HAVE_SA_RESTORER && defined SA_RESTORER
-       if (sa.sa_flags & SA_RESTORER)
-               tprintf(", sa_restorer=%p", sa.sa_restorer);
+       if (sa.sa_flags & SA_RESTORER) {
+               tprints(", sa_restorer=");
+               printaddr(sa.sa_restorer);
+       }
 #endif
        tprints("}");
 }
@@ -573,11 +561,11 @@ SYS_FUNC(rt_sigaction)
        } 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]);
+               tprintf(", %#" PRI_klx ", %" PRI_klu, tcp->u_arg[3], tcp->u_arg[4]);
 #elif defined(ALPHA)
-               tprintf(", %lu, %#lx", tcp->u_arg[3], tcp->u_arg[4]);
+               tprintf(", %" PRI_klu ", %#" PRI_klx, tcp->u_arg[3], tcp->u_arg[4]);
 #else
-               tprintf(", %lu", tcp->u_arg[3]);
+               tprintf(", %" PRI_klu, tcp->u_arg[3]);
 #endif
        }
        return 0;
@@ -594,7 +582,7 @@ SYS_FUNC(rt_sigpending)
                 */
                print_sigset_addr_len_limit(tcp, tcp->u_arg[0],
                                            tcp->u_arg[1], 1);
-               tprintf(", %lu", tcp->u_arg[1]);
+               tprintf(", %" PRI_klu, tcp->u_arg[1]);
        }
        return 0;
 }
@@ -603,17 +591,18 @@ SYS_FUNC(rt_sigsuspend)
 {
        /* 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]);
+       tprintf(", %" PRI_klu, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
 
 static void
-print_sigqueueinfo(struct tcb *tcp, int sig, unsigned long uinfo)
+print_sigqueueinfo(struct tcb *const tcp, const int sig,
+                  const kernel_ulong_t addr)
 {
        printsignal(sig);
        tprints(", ");
-       printsiginfo_at(tcp, uinfo);
+       printsiginfo_at(tcp, addr);
 }
 
 SYS_FUNC(rt_sigqueueinfo)
@@ -647,7 +636,7 @@ SYS_FUNC(rt_sigtimedwait)
                        printaddr(tcp->u_arg[1]);
                        tprints(", ");
                        print_timespec(tcp, tcp->u_arg[2]);
-                       tprintf(", %lu", tcp->u_arg[3]);
+                       tprintf(", %" PRI_klu, tcp->u_arg[3]);
                } else {
                        char *sts = xstrdup(sprint_timespec(tcp, tcp->u_arg[2]));
                        set_tcb_priv_data(tcp, sts, free);
@@ -657,7 +646,7 @@ SYS_FUNC(rt_sigtimedwait)
                        printsiginfo_at(tcp, tcp->u_arg[1]);
                        tprints(", ");
                        tprints(get_tcb_priv_data(tcp));
-                       tprintf(", %lu", tcp->u_arg[3]);
+                       tprintf(", %" PRI_klu, tcp->u_arg[3]);
                }
 
                if (!syserror(tcp) && tcp->u_rval) {