mem: decode hugetlb page size in mmap flags

[strace] / printsiginfo.c

diff --git a/printsiginfo.c b/printsiginfo.c
index 1b32e797a007491a879ac4e95a542c923c5f1ef4..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
@@ -77,7 +78,7 @@ static void
 printsigval(const siginfo_t *sip)
 {
        tprintf(", si_value={int=%d, ptr=", sip->si_int);
-       printaddr((unsigned long) sip->si_ptr);
+       printaddr(ptr_to_kulong(sip->si_ptr));
        tprints("}");
 }
 
@@ -178,7 +179,7 @@ print_si_info(const siginfo_t *sip)
                case SIGILL: case SIGFPE:
                case SIGSEGV: case SIGBUS:
                        tprints(", si_addr=");
-                       printaddr((unsigned long) sip->si_addr);
+                       printaddr(ptr_to_kulong(sip->si_addr));
                        break;
                case SIGPOLL:
                        switch (sip->si_code) {
@@ -194,7 +195,7 @@ print_si_info(const siginfo_t *sip)
                                syscall_name((unsigned) sip->si_syscall);
 
                        tprints(", si_call_addr=");
-                       printaddr((unsigned long) sip->si_call_addr);
+                       printaddr(ptr_to_kulong(sip->si_call_addr));
                        tprints(", si_syscall=");
                        if (scname)
                                tprintf("__NR_%s", scname);
@@ -239,7 +240,7 @@ printsiginfo(const siginfo_t *sip)
 }
 
 MPERS_PRINTER_DECL(void, printsiginfo_at,
-                  struct tcb *tcp, long addr)
+                  struct tcb *const tcp, const kernel_ulong_t addr)
 {
        siginfo_t si;
 
@@ -255,7 +256,7 @@ print_siginfo_t(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 }
 
 MPERS_PRINTER_DECL(void, print_siginfo_array, struct tcb *const tcp,
-                  const kernel_ureg_t addr, const unsigned long len)
+                  const kernel_ulong_t addr, const kernel_ulong_t len)
 {
        siginfo_t si;