mem: decode hugetlb page size in mmap flags

[strace] / printsiginfo.c

diff --git a/printsiginfo.c b/printsiginfo.c
index 78508df31abdb7b5adb2e16056d428686a9ca5e2..2c7b203484269978bcfe9d14b7df1212ffe1bac6 100644 (file)
--- a/printsiginfo.c
+++ b/printsiginfo.c
@@ -7,6 +7,7 @@
  * Copyright (c) 2013 Denys Vlasenko <vda.linux@googlemail.com>
  * Copyright (c) 2011-2015 Dmitry V. Levin <ldv@altlinux.org>
  * Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com>
+ * Copyright (c) 2015-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -76,8 +77,9 @@ printsigsource(const siginfo_t *sip)
 static void
 printsigval(const siginfo_t *sip)
 {
-       tprintf(", si_value={int=%d, ptr=%#lx}",
-               sip->si_int, (unsigned long) sip->si_ptr);
+       tprintf(", si_value={int=%d, ptr=", sip->si_int);
+       printaddr(ptr_to_kulong(sip->si_ptr));
+       tprints("}");
 }
 
 static void
@@ -171,13 +173,13 @@ print_si_info(const siginfo_t *sip)
                        else
                                printsignal(sip->si_status);
                        tprintf(", si_utime=%llu, si_stime=%llu",
-                               (unsigned long long) sip->si_utime,
-                               (unsigned long long) sip->si_stime);
+                               zero_extend_signed_to_ull(sip->si_utime),
+                               zero_extend_signed_to_ull(sip->si_stime));
                        break;
                case SIGILL: case SIGFPE:
                case SIGSEGV: case SIGBUS:
-                       tprintf(", si_addr=%#lx",
-                               (unsigned long) sip->si_addr);
+                       tprints(", si_addr=");
+                       printaddr(ptr_to_kulong(sip->si_addr));
                        break;
                case SIGPOLL:
                        switch (sip->si_code) {
@@ -188,12 +190,21 @@ print_si_info(const siginfo_t *sip)
                        }
                        break;
 #ifdef HAVE_SIGINFO_T_SI_SYSCALL
-               case SIGSYS:
-                       tprintf(", si_call_addr=%#lx, si_syscall=__NR_%s, si_arch=",
-                               (unsigned long) sip->si_call_addr,
-                               syscall_name((unsigned) sip->si_syscall));
+               case SIGSYS: {
+                       const char *scname =
+                               syscall_name((unsigned) sip->si_syscall);
+
+                       tprints(", si_call_addr=");
+                       printaddr(ptr_to_kulong(sip->si_call_addr));
+                       tprints(", si_syscall=");
+                       if (scname)
+                               tprintf("__NR_%s", scname);
+                       else
+                               tprintf("%u", (unsigned) sip->si_syscall);
+                       tprints(", si_arch=");
                        printxval(audit_arch, sip->si_arch, "AUDIT_ARCH_???");
                        break;
+               }
 #endif
                default:
                        if (sip->si_pid || sip->si_uid)
@@ -228,7 +239,8 @@ printsiginfo(const siginfo_t *sip)
        tprints("}");
 }
 
-MPERS_PRINTER_DECL(void, printsiginfo_at)(struct tcb *tcp, long addr)
+MPERS_PRINTER_DECL(void, printsiginfo_at,
+                  struct tcb *const tcp, const kernel_ulong_t addr)
 {
        siginfo_t si;
 
@@ -243,7 +255,8 @@ print_siginfo_t(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
        return true;
 }
 
-MPERS_PRINTER_DECL(void, print_siginfo_array)(struct tcb *tcp, unsigned long addr, unsigned long len)
+MPERS_PRINTER_DECL(void, print_siginfo_array, struct tcb *const tcp,
+                  const kernel_ulong_t addr, const kernel_ulong_t len)
 {
        siginfo_t si;