Automatically replace PRI_kr[dux] with PRI_kl[dux]

Remove temporary macros created for transition from long
to kernel_ulong_t.

Automatically replace PRI_kr[dux] with PRI_kl[dux] using
$ git grep -l 'PRI_kr[dux]' | xargs sed -ri 's/PRI_kr([dux])/PRI_kl\1/g'

* defs.h (PRI_krd, PRI_kru, PRI_krx): Remove.  All users updated.
This commit is contained in:
Дмитрий Левин 2016-12-26 10:16:35 +00:00
parent 7fa3d78319
commit 89636759d7
50 changed files with 124 additions and 128 deletions

View File

@ -150,7 +150,7 @@ MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp,
/* take arg as a value, not as a pointer */
case BLKRASET:
case BLKFRASET:
tprintf(", %" PRI_kru, arg);
tprintf(", %" PRI_klu, arg);
break;
/* return an unsigned short */

View File

@ -104,7 +104,7 @@ SYS_FUNC(clone)
tprints(", ");
#ifdef ARG_STACKSIZE
if (ARG_STACKSIZE != -1)
tprintf("stack_size=%#" PRI_krx ", ",
tprintf("stack_size=%#" PRI_klx ", ",
tcp->u_arg[ARG_STACKSIZE]);
#endif
tprints("flags=");

View File

@ -42,7 +42,7 @@ SYS_FUNC(copy_file_range)
printnum_int64(tcp, tcp->u_arg[3], "%" PRId64);
tprints(", ");
/* size_t len */
tprintf("%" PRI_kru ", ", tcp->u_arg[4]);
tprintf("%" PRI_klu ", ", tcp->u_arg[4]);
/* unsigned int flags */
tprintf("%u", (unsigned int) tcp->u_arg[5]);

4
defs.h
View File

@ -985,10 +985,6 @@ scno_is_valid(kernel_ulong_t scno)
#define PRI_klu PRI_kl"u"
#define PRI_klx PRI_kl"x"
#define PRI_krd PRI_kld
#define PRI_kru PRI_klu
#define PRI_krx PRI_klx
/*
* The kernel used to define 64-bit types on 64-bit systems on a per-arch
* basis. Some architectures would use unsigned long and others would use

View File

@ -66,7 +66,7 @@ SYS_FUNC(readdir)
print_old_dirent(tcp, tcp->u_arg[1]);
/* Not much point in printing this out, it is always 1. */
if (tcp->u_arg[2] != 1)
tprintf(", %" PRI_kru, tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
}
return 0;
}

View File

@ -111,7 +111,7 @@ SYS_FUNC(epoll_pwait)
tprints(", ");
/* NB: kernel requires arg[5] == NSIG / 8 */
print_sigset_addr_len(tcp, tcp->u_arg[4], tcp->u_arg[5]);
tprintf(", %" PRI_kru, tcp->u_arg[5]);
tprintf(", %" PRI_klu, tcp->u_arg[5]);
}
return 0;
}

View File

@ -497,7 +497,7 @@ evdev_write_ioctl(struct tcb *const tcp, const unsigned int code,
# ifdef EVIOCREVOKE
case EVIOCREVOKE:
# endif
tprintf(", %" PRI_kru, arg);
tprintf(", %" PRI_klu, arg);
return 1;
# ifdef EVIOCSCLOCKID
case EVIOCSCLOCKID:

View File

@ -96,11 +96,11 @@ print_fcntl(struct tcb *tcp)
break;
case F_SETOWN:
case F_SETPIPE_SZ:
tprintf(", %" PRI_krd, tcp->u_arg[2]);
tprintf(", %" PRI_kld, tcp->u_arg[2]);
break;
case F_DUPFD:
case F_DUPFD_CLOEXEC:
tprintf(", %" PRI_krd, tcp->u_arg[2]);
tprintf(", %" PRI_kld, tcp->u_arg[2]);
return RVAL_DECODED | RVAL_FD;
case F_SETFL:
tprints(", ");
@ -185,7 +185,7 @@ print_fcntl(struct tcb *tcp)
tcp->auxstr = signame(tcp->u_rval);
return RVAL_STR;
default:
tprintf(", %#" PRI_krx, tcp->u_arg[2]);
tprintf(", %#" PRI_klx, tcp->u_arg[2]);
break;
}
return RVAL_DECODED;

View File

@ -4,7 +4,7 @@ SYS_FUNC(fstatfs64)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
} else {
print_struct_statfs64(tcp, tcp->u_arg[2], tcp->u_arg[1]);
}

View File

@ -7,7 +7,7 @@ SYS_FUNC(getcwd)
printaddr(tcp->u_arg[0]);
else
printpathn(tcp, tcp->u_arg[0], tcp->u_rval - 1);
tprintf(", %" PRI_kru, tcp->u_arg[1]);
tprintf(", %" PRI_klu, tcp->u_arg[1]);
}
return 0;
}

View File

@ -8,7 +8,7 @@ SYS_FUNC(getrandom)
printaddr(tcp->u_arg[0]);
else
printstrn(tcp, tcp->u_arg[0], tcp->u_rval);
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
printflags(getrandom_flags, tcp->u_arg[2], "GRND_???");
}
return 0;

View File

@ -31,7 +31,7 @@ SYS_FUNC(gethostname)
printaddr(tcp->u_arg[0]);
else
printstr(tcp, tcp->u_arg[0]);
tprintf(", %" PRI_kru, tcp->u_arg[1]);
tprintf(", %" PRI_klu, tcp->u_arg[1]);
}
return 0;
}

24
io.c
View File

@ -42,7 +42,7 @@ SYS_FUNC(read)
printaddr(tcp->u_arg[1]);
else
printstrn(tcp, tcp->u_arg[1], tcp->u_rval);
tprintf(", %" PRI_kru, tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
}
return 0;
}
@ -52,7 +52,7 @@ SYS_FUNC(write)
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
printstrn(tcp, tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %" PRI_kru, tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
return RVAL_DECODED;
}
@ -101,7 +101,7 @@ print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
break;
}
tprintf(", iov_len=%" PRI_kru "}", iov[1]);
tprintf(", iov_len=%" PRI_klu "}", iov[1]);
return true;
}
@ -132,7 +132,7 @@ SYS_FUNC(readv)
tprint_iov_upto(tcp, tcp->u_arg[2], tcp->u_arg[1],
syserror(tcp) ? IOV_DECODE_ADDR :
IOV_DECODE_STR, tcp->u_rval);
tprintf(", %" PRI_kru, tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
}
return 0;
}
@ -142,7 +142,7 @@ SYS_FUNC(writev)
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
tprintf(", %" PRI_kru, tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
return RVAL_DECODED;
}
@ -157,7 +157,7 @@ SYS_FUNC(pread)
printaddr(tcp->u_arg[1]);
else
printstrn(tcp, tcp->u_arg[1], tcp->u_rval);
tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
printllval(tcp, "%lld", 3);
}
return 0;
@ -168,7 +168,7 @@ SYS_FUNC(pwrite)
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
printstrn(tcp, tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
printllval(tcp, "%lld", 3);
return RVAL_DECODED;
@ -180,12 +180,12 @@ print_lld_from_low_high_val(struct tcb *tcp, int arg)
#if SIZEOF_LONG > 4 && SIZEOF_LONG == SIZEOF_LONG_LONG
# ifndef current_klongsize
if (current_klongsize < SIZEOF_LONG) {
tprintf("%" PRI_krd, (tcp->u_arg[arg + 1] << current_wordsize * 8)
tprintf("%" PRI_kld, (tcp->u_arg[arg + 1] << current_wordsize * 8)
| tcp->u_arg[arg]);
} else
# endif /* !current_klongsize */
{
tprintf("%" PRI_krd, tcp->u_arg[arg]);
tprintf("%" PRI_kld, tcp->u_arg[arg]);
}
#elif SIZEOF_LONG > 4
# error Unsupported configuration: SIZEOF_LONG > 4 && SIZEOF_LONG_LONG > SIZEOF_LONG
@ -280,7 +280,7 @@ SYS_FUNC(tee)
printfd(tcp, tcp->u_arg[1]);
tprints(", ");
/* size_t len */
tprintf("%" PRI_kru ", ", tcp->u_arg[2]);
tprintf("%" PRI_klu ", ", tcp->u_arg[2]);
/* unsigned int flags */
printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
@ -302,7 +302,7 @@ SYS_FUNC(splice)
printnum_int64(tcp, tcp->u_arg[3], "%" PRId64);
tprints(", ");
/* size_t len */
tprintf("%" PRI_kru ", ", tcp->u_arg[4]);
tprintf("%" PRI_klu ", ", tcp->u_arg[4]);
/* unsigned int flags */
printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
@ -316,7 +316,7 @@ SYS_FUNC(vmsplice)
tprints(", ");
/* const struct iovec *iov, unsigned long nr_segs */
tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
/* unsigned int flags */
printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");

View File

@ -323,7 +323,7 @@ SYS_FUNC(ioctl)
if (ret)
--ret;
else
tprintf(", %#" PRI_krx, tcp->u_arg[2]);
tprintf(", %#" PRI_klx, tcp->u_arg[2]);
ret |= RVAL_DECODED;
} else {
if (ret)

View File

@ -2,7 +2,7 @@
SYS_FUNC(ioperm)
{
tprintf("%#" PRI_krx ", %#" PRI_krx ", %d",
tprintf("%#" PRI_klx ", %#" PRI_klx ", %d",
tcp->u_arg[0], tcp->u_arg[1], (int) tcp->u_arg[2]);
return RVAL_DECODED;

2
ipc.c
View File

@ -45,7 +45,7 @@ SYS_FUNC(ipc)
unsigned int i;
for (i = 1; i < tcp->s_ent->nargs; ++i)
tprintf(", %#" PRI_krx, tcp->u_arg[i]);
tprintf(", %#" PRI_klx, tcp->u_arg[i]);
return RVAL_DECODED;
}

View File

@ -82,7 +82,7 @@ tprint_msgrcv(struct tcb *const tcp, const kernel_ulong_t addr,
const kernel_ulong_t count, const kernel_ulong_t msgtyp)
{
tprint_msgbuf(tcp, addr, count);
tprintf("%" PRI_krd ", ", msgtyp);
tprintf("%" PRI_kld ", ", msgtyp);
}
static int
@ -121,7 +121,7 @@ SYS_FUNC(msgrcv)
kernel_ulong_t pair[2];
if (fetch_msgrcv_args(tcp, tcp->u_arg[3], pair))
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
else
tprint_msgrcv(tcp, pair[0],
tcp->u_arg[1], pair[1]);

View File

@ -126,7 +126,7 @@ SYS_FUNC(semctl)
) {
printnum_ptr(tcp, tcp->u_arg[3]);
} else {
tprintf("%#" PRI_krx, tcp->u_arg[3]);
tprintf("%#" PRI_klx, tcp->u_arg[3]);
}
return RVAL_DECODED;
}

View File

@ -48,7 +48,7 @@ SYS_FUNC(shmget)
tprintf("%#x", key);
else
tprints("IPC_PRIVATE");
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
if (printflags(shm_resource_flags, tcp->u_arg[2] & ~0777, NULL) != 0)
tprints("|");
print_numeric_umode_t(tcp->u_arg[2] & 0777);

View File

@ -55,9 +55,9 @@ print_seg(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
tprints("{buf=");
printaddr(seg[0]);
tprintf(", bufsz=%" PRI_kru ", mem=", seg[1]);
tprintf(", bufsz=%" PRI_klu ", mem=", seg[1]);
printaddr(seg[2]);
tprintf(", memsz=%" PRI_kru "}", seg[3]);
tprintf(", memsz=%" PRI_klu "}", seg[3]);
return true;
}
@ -82,7 +82,7 @@ SYS_FUNC(kexec_load)
{
/* entry, nr_segments */
printaddr(tcp->u_arg[0]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
/* segments */
print_kexec_segments(tcp, tcp->u_arg[2], tcp->u_arg[1]);

View File

@ -59,7 +59,7 @@ SYS_FUNC(add_key)
tprints(", ");
printstrn(tcp, tcp->u_arg[2], tcp->u_arg[3]);
/* payload length */
tprintf(", %" PRI_kru ", ", tcp->u_arg[3]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[3]);
/* keyring serial number */
print_keyring_serial_number(tcp->u_arg[4]);

4
ldt.c
View File

@ -67,12 +67,12 @@ print_user_desc(struct tcb *const tcp, const kernel_ulong_t addr)
SYS_FUNC(modify_ldt)
{
tprintf("%" PRI_krd ", ", tcp->u_arg[0]);
tprintf("%" PRI_kld ", ", tcp->u_arg[0]);
if (tcp->u_arg[2] != sizeof(struct user_desc))
printaddr(tcp->u_arg[1]);
else
print_user_desc(tcp, tcp->u_arg[1]);
tprintf(", %" PRI_kru, tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
return RVAL_DECODED;
}

View File

@ -141,7 +141,7 @@ arch_get_scno(struct tcb *tcp)
* Stracing of i386 apps is still supported.
*/
if (currpers == 0) {
error_msg("syscall_%" PRI_kru "(...) in unsupported "
error_msg("syscall_%" PRI_klu "(...) in unsupported "
"64-bit mode of process PID=%d", scno, tcp->pid);
return 0;
}

2
loop.c
View File

@ -190,7 +190,7 @@ loop_ioctl(struct tcb *const tcp, const unsigned int code,
#ifdef LOOP_SET_DIRECT_IO
case LOOP_SET_DIRECT_IO:
tprintf(", %" PRI_kru, arg);
tprintf(", %" PRI_klu, arg);
break;
#endif

20
mem.c
View File

@ -64,7 +64,7 @@ print_mmap(struct tcb *tcp, kernel_ulong_t *u_arg, unsigned long long offset)
const int fd = u_arg[4];
printaddr(addr);
tprintf(", %" PRI_kru ", ", len);
tprintf(", %" PRI_klu ", ", len);
printflags64(mmap_prot, prot, "PROT_???");
tprints(", ");
#ifdef MAP_TYPE
@ -177,7 +177,7 @@ SYS_FUNC(mmap_4koff)
SYS_FUNC(munmap)
{
printaddr(tcp->u_arg[0]);
tprintf(", %" PRI_kru, tcp->u_arg[1]);
tprintf(", %" PRI_klu, tcp->u_arg[1]);
return RVAL_DECODED;
}
@ -210,7 +210,7 @@ SYS_FUNC(pkey_mprotect)
SYS_FUNC(mremap)
{
printaddr(tcp->u_arg[0]);
tprintf(", %" PRI_kru ", %" PRI_kru ", ", tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %" PRI_klu ", %" PRI_klu ", ", tcp->u_arg[1], tcp->u_arg[2]);
printflags64(mremap_flags, tcp->u_arg[3], "MREMAP_???");
#ifdef MREMAP_FIXED
if ((tcp->u_arg[3] & (MREMAP_MAYMOVE | MREMAP_FIXED)) ==
@ -227,7 +227,7 @@ SYS_FUNC(mremap)
SYS_FUNC(madvise)
{
printaddr(tcp->u_arg[0]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
printxval(madvise_cmds, tcp->u_arg[2], "MADV_???");
return RVAL_DECODED;
@ -249,7 +249,7 @@ SYS_FUNC(msync)
/* addr */
printaddr(tcp->u_arg[0]);
/* len */
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
/* flags */
printflags(mctl_sync, tcp->u_arg[2], "MS_???");
@ -261,7 +261,7 @@ SYS_FUNC(msync)
SYS_FUNC(mlock2)
{
printaddr(tcp->u_arg[0]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
printflags(mlock_flags, tcp->u_arg[2], "MLOCK_???");
return RVAL_DECODED;
@ -271,7 +271,7 @@ SYS_FUNC(mincore)
{
if (entering(tcp)) {
printaddr(tcp->u_arg[0]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
} else {
const unsigned long page_size = get_pagesize();
const unsigned long page_mask = page_size - 1;
@ -319,9 +319,9 @@ SYS_FUNC(remap_file_pages)
const kernel_ulong_t flags = tcp->u_arg[4];
printaddr(addr);
tprintf(", %" PRI_kru ", ", size);
tprintf(", %" PRI_klu ", ", size);
printflags64(mmap_prot, prot, "PROT_???");
tprintf(", %" PRI_kru ", ", pgoff);
tprintf(", %" PRI_klu ", ", pgoff);
#ifdef MAP_TYPE
printxval64(mmap_flags, flags & MAP_TYPE, "MAP_???");
addflags(mmap_flags, flags & ~MAP_TYPE);
@ -349,7 +349,7 @@ SYS_FUNC(subpage_prot)
kernel_ulong_t map = tcp->u_arg[2];
printaddr(addr);
tprintf(", %" PRI_kru ", ", len);
tprintf(", %" PRI_klu ", ", len);
unsigned int entry;
print_array(tcp, map, nmemb, &entry, sizeof(entry),

View File

@ -159,7 +159,7 @@ dumpiov_in_mmsghdr(struct tcb *const tcp, kernel_ulong_t addr)
fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
if (!fetched)
break;
tprintf(" = %" PRI_kru " buffers in vector %u\n",
tprintf(" = %" PRI_klu " buffers in vector %u\n",
(kernel_ulong_t) mmsg.msg_hdr.msg_iovlen, i);
dumpiov_upto(tcp, mmsg.msg_hdr.msg_iovlen,
ptr_to_kulong(mmsg.msg_hdr.msg_iov),

View File

@ -297,7 +297,7 @@ decode_msg_control(struct tcb *const tcp, const kernel_ulong_t addr,
if (u.ptr != buf)
tprints(", ");
tprintf("{cmsg_len=%" PRI_kru ", cmsg_level=", cmsg_len);
tprintf("{cmsg_len=%" PRI_klu ", cmsg_level=", cmsg_len);
printxval(socketlayers, cmsg_level, "SOL_???");
tprints(", cmsg_type=");
@ -355,11 +355,11 @@ print_struct_msghdr(struct tcb *tcp, const struct msghdr *msg,
tprint_iov_upto(tcp, msg->msg_iovlen,
ptr_to_kulong(msg->msg_iov), decode, data_size);
tprintf(", msg_iovlen=%" PRI_kru, (kernel_ulong_t) msg->msg_iovlen);
tprintf(", msg_iovlen=%" PRI_klu, (kernel_ulong_t) msg->msg_iovlen);
decode_msg_control(tcp, ptr_to_kulong(msg->msg_control),
msg->msg_controllen);
tprintf(", msg_controllen=%" PRI_kru, (kernel_ulong_t) msg->msg_controllen);
tprintf(", msg_controllen=%" PRI_klu, (kernel_ulong_t) msg->msg_controllen);
tprints(", msg_flags=");
printflags(msg_flags, msg->msg_flags, "MSG_???");

14
net.c
View File

@ -159,7 +159,7 @@ SYS_FUNC(socket)
#endif
default:
tprintf("%" PRI_kru, tcp->u_arg[2]);
tprintf("%" PRI_klu, tcp->u_arg[2]);
break;
}
@ -181,7 +181,7 @@ SYS_FUNC(listen)
{
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
tprintf("%" PRI_kru, tcp->u_arg[1]);
tprintf("%" PRI_klu, tcp->u_arg[1]);
return RVAL_DECODED;
}
@ -251,7 +251,7 @@ SYS_FUNC(send)
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
/* flags */
printflags(msg_flags, tcp->u_arg[3], "MSG_???");
@ -263,7 +263,7 @@ SYS_FUNC(sendto)
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
/* flags */
printflags(msg_flags, tcp->u_arg[3], "MSG_???");
/* to address */
@ -289,7 +289,7 @@ SYS_FUNC(recv)
tcp->u_rval);
}
tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
printflags(msg_flags, tcp->u_arg[3], "MSG_???");
}
return 0;
@ -314,7 +314,7 @@ SYS_FUNC(recvfrom)
tcp->u_rval);
}
/* size */
tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
/* flags */
printflags(msg_flags, tcp->u_arg[3], "MSG_???");
tprints(", ");
@ -419,7 +419,7 @@ SYS_FUNC(socketpair)
printxval(addrfams, tcp->u_arg[0], "AF_???");
tprints(", ");
tprint_sock_type(tcp->u_arg[1]);
tprintf(", %" PRI_kru, tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
} else {
tprints(", ");
decode_pair_fd(tcp, tcp->u_arg[3]);

14
numa.c
View File

@ -35,7 +35,7 @@ print_node(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
tprintf("%#0*x", (int) elem_size * 2 + 2,
* (unsigned int *) elem_buf);
} else {
tprintf("%#0*" PRI_krx, (int) elem_size * 2 + 2,
tprintf("%#0*" PRI_klx, (int) elem_size * 2 + 2,
* (kernel_ulong_t *) elem_buf);
}
@ -63,7 +63,7 @@ print_nodemask(struct tcb *const tcp, const kernel_ulong_t addr,
SYS_FUNC(migrate_pages)
{
tprintf("%d, %" PRI_kru ", ", (int) tcp->u_arg[0], tcp->u_arg[1]);
tprintf("%d, %" PRI_klu ", ", (int) tcp->u_arg[0], tcp->u_arg[1]);
print_nodemask(tcp, tcp->u_arg[2], tcp->u_arg[1]);
tprints(", ");
print_nodemask(tcp, tcp->u_arg[3], tcp->u_arg[1]);
@ -77,11 +77,11 @@ SYS_FUNC(migrate_pages)
SYS_FUNC(mbind)
{
printaddr(tcp->u_arg[0]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
printxval64(policies, tcp->u_arg[2], "MPOL_???");
tprints(", ");
print_nodemask(tcp, tcp->u_arg[3], tcp->u_arg[4]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[4]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[4]);
printflags(mbindflags, tcp->u_arg[5], "MPOL_???");
return RVAL_DECODED;
@ -92,7 +92,7 @@ SYS_FUNC(set_mempolicy)
printxval(policies, tcp->u_arg[0], "MPOL_???");
tprints(", ");
print_nodemask(tcp, tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %" PRI_kru, tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
return RVAL_DECODED;
}
@ -110,7 +110,7 @@ SYS_FUNC(get_mempolicy)
}
tprints(", ");
print_nodemask(tcp, tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
printaddr(tcp->u_arg[3]);
tprints(", ");
printflags64(mempolicyflags, tcp->u_arg[4], "MPOL_???");
@ -163,7 +163,7 @@ SYS_FUNC(move_pages)
kernel_ulong_t buf;
if (entering(tcp)) {
tprintf("%d, %" PRI_kru ", ", (int) tcp->u_arg[0], npages);
tprintf("%d, %" PRI_klu ", ", (int) tcp->u_arg[0], npages);
print_array(tcp, tcp->u_arg[2], npages, &buf, current_wordsize,
umoven_or_printaddr, print_addr, 0);
tprints(", ");

4
poll.c
View File

@ -95,7 +95,7 @@ decode_poll_exiting(struct tcb *const tcp, const kernel_ulong_t pts)
*outptr++ = '[';
else
outptr = stpcpy(outptr, ", ");
outptr += sprintf(outptr, "%#" PRI_krx, cur);
outptr += sprintf(outptr, "%#" PRI_klx, cur);
break;
}
if (!fds.revents)
@ -178,7 +178,7 @@ SYS_FUNC(ppoll)
tprints(", ");
/* NB: kernel requires arg[4] == NSIG / 8 */
print_sigset_addr_len(tcp, tcp->u_arg[3], tcp->u_arg[4]);
tprintf(", %" PRI_kru, tcp->u_arg[4]);
tprintf(", %" PRI_klu, tcp->u_arg[4]);
return 0;
} else {

View File

@ -48,5 +48,5 @@ MPERS_PRINTER_DECL(void, tprint_msgbuf, struct tcb *const tcp,
printstrn(tcp, addr + sizeof(msg.mtype), count);
tprints("}");
}
tprintf(", %" PRI_kru ", ", count);
tprintf(", %" PRI_klu ", ", count);
}

View File

@ -85,7 +85,7 @@ MPERS_PRINTER_DECL(const char *, sprint_timespec,
strcpy(buf, "NULL");
} else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
umove(tcp, addr, &t)) {
snprintf(buf, sizeof(buf), "%#" PRI_krx, addr);
snprintf(buf, sizeof(buf), "%#" PRI_klx, addr);
} else {
snprintf(buf, sizeof(buf), timespec_fmt,
(intmax_t) t.tv_sec, (intmax_t) t.tv_nsec);

View File

@ -86,7 +86,7 @@ MPERS_PRINTER_DECL(const char *, sprint_timeval,
strcpy(buf, "NULL");
} else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
umove(tcp, addr, &t)) {
snprintf(buf, sizeof(buf), "%#" PRI_krx, addr);
snprintf(buf, sizeof(buf), "%#" PRI_klx, addr);
} else {
snprintf(buf, sizeof(buf), timeval_fmt,
(intmax_t) t.tv_sec, (intmax_t) t.tv_usec);
@ -169,7 +169,7 @@ sprint_timeval32(struct tcb *const tcp, const kernel_ulong_t addr)
strcpy(buf, "NULL");
} else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
umove(tcp, addr, &t)) {
snprintf(buf, sizeof(buf), "%#" PRI_krx, addr);
snprintf(buf, sizeof(buf), "%#" PRI_klx, addr);
} else {
snprintf(buf, sizeof(buf), timeval_fmt,
(intmax_t) t.tv_sec, (intmax_t) t.tv_usec);

View File

@ -73,7 +73,7 @@ print_user_offset_addr(const kernel_ulong_t addr)
printaddr(addr);
} else {
--x;
tprintf("%s + %" PRI_kru,
tprintf("%s + %" PRI_klu,
x->str, addr - (kernel_ulong_t) x->val);
}
} else {
@ -121,7 +121,7 @@ SYS_FUNC(ptrace)
case PTRACE_GETSIGMASK:
case PTRACE_SETSIGMASK:
case PTRACE_SECCOMP_GET_FILTER:
tprintf(", %" PRI_kru, addr);
tprintf(", %" PRI_klu, addr);
break;
case PTRACE_PEEKSIGINFO: {
tprints(", ");

View File

@ -43,13 +43,13 @@ SYS_FUNC(process_vm_readv)
syserror(tcp) ? IOV_DECODE_ADDR : IOV_DECODE_STR,
tcp->u_rval);
/* arg 3: local iovcnt */
tprintf(", %" PRI_kru ", ", local_iovcnt);
tprintf(", %" PRI_klu ", ", local_iovcnt);
/* arg 4: remote iov */
tprint_iov(tcp, remote_iovcnt, tcp->u_arg[3],
IOV_DECODE_ADDR);
/* arg 5: remote iovcnt */
/* arg 6: flags */
tprintf(", %" PRI_kru ", %" PRI_kru, remote_iovcnt, flags);
tprintf(", %" PRI_klu ", %" PRI_klu, remote_iovcnt, flags);
}
return 0;
}
@ -65,12 +65,12 @@ SYS_FUNC(process_vm_writev)
/* arg 2: local iov */
tprint_iov(tcp, local_iovcnt, tcp->u_arg[1], IOV_DECODE_STR);
/* arg 3: local iovcnt */
tprintf(", %" PRI_kru ", ", local_iovcnt);
tprintf(", %" PRI_klu ", ", local_iovcnt);
/* arg 4: remote iov */
tprint_iov(tcp, remote_iovcnt, tcp->u_arg[3], IOV_DECODE_ADDR);
/* arg 5: remote iovcnt */
/* arg 6: flags */
tprintf(", %" PRI_kru ", %" PRI_kru, remote_iovcnt, flags);
tprintf(", %" PRI_klu ", %" PRI_klu, remote_iovcnt, flags);
return RVAL_DECODED;
}

2
ptp.c
View File

@ -72,7 +72,7 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code,
}
case PTP_ENABLE_PPS:
tprintf(", %" PRI_krd, arg);
tprintf(", %" PRI_kld, arg);
break;
case PTP_SYS_OFFSET: {

View File

@ -6,7 +6,7 @@ SYS_FUNC(readahead)
printfd(tcp, tcp->u_arg[0]);
argn = printllval(tcp, ", %lld", 1);
tprintf(", %" PRI_kru, tcp->u_arg[argn]);
tprintf(", %" PRI_klu, tcp->u_arg[argn]);
return RVAL_DECODED;
}

View File

@ -51,7 +51,7 @@ decode_readlink(struct tcb *tcp, int offset)
* past return buffer's end.
*/
printstrn(tcp, tcp->u_arg[offset + 1], tcp->u_rval);
tprintf(", %" PRI_kru, tcp->u_arg[offset + 2]);
tprintf(", %" PRI_klu, tcp->u_arg[offset + 2]);
}
return 0;
}

2
rtc.c
View File

@ -100,7 +100,7 @@ MPERS_PRINTER_DECL(int, rtc_ioctl, struct tcb *const tcp,
break;
case RTC_IRQP_SET:
case RTC_EPOCH_SET:
tprintf(", %" PRI_kru, arg);
tprintf(", %" PRI_klu, arg);
break;
case RTC_IRQP_READ:
case RTC_EPOCH_READ:

View File

@ -35,7 +35,7 @@ SYS_FUNC(sendfile64)
printfd(tcp, tcp->u_arg[1]);
tprints(", ");
if (!printnum_int64(tcp, tcp->u_arg[2], "%" PRIu64)) {
tprintf(", %" PRI_kru, tcp->u_arg[3]);
tprintf(", %" PRI_klu, tcp->u_arg[3]);
return RVAL_DECODED;
}
} else {
@ -43,7 +43,7 @@ SYS_FUNC(sendfile64)
tprints(" => ");
printnum_int64(tcp, tcp->u_arg[2], "%" PRIu64);
}
tprintf(", %" PRI_kru, tcp->u_arg[3]);
tprintf(", %" PRI_klu, tcp->u_arg[3]);
}
return 0;
@ -58,7 +58,7 @@ SYS_FUNC(sendfile)
tprints(", ");
if (!printnum_ulong(tcp, tcp->u_arg[2])
|| !tcp->u_arg[3]) {
tprintf(", %" PRI_kru, tcp->u_arg[3]);
tprintf(", %" PRI_klu, tcp->u_arg[3]);
return RVAL_DECODED;
}
} else {
@ -66,7 +66,7 @@ SYS_FUNC(sendfile)
tprints(" => ");
printnum_ulong(tcp, tcp->u_arg[2]);
}
tprintf(", %" PRI_kru, tcp->u_arg[3]);
tprintf(", %" PRI_klu, tcp->u_arg[3]);
}
return 0;

View File

@ -52,7 +52,7 @@ print_stack_t(struct tcb *const tcp, const kernel_ulong_t addr)
printaddr(ptr_to_kulong(ss.ss_sp));
tprints(", ss_flags=");
printflags(sigaltstack_flags, ss.ss_flags, "SS_???");
tprintf(", ss_size=%" PRI_kru "}", (kernel_ulong_t) ss.ss_size);
tprintf(", ss_size=%" PRI_klu "}", (kernel_ulong_t) ss.ss_size);
}
SYS_FUNC(sigaltstack)

View File

@ -463,7 +463,7 @@ SYS_FUNC(rt_sigprocmask)
}
else {
print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
tprintf(", %" PRI_kru, tcp->u_arg[3]);
tprintf(", %" PRI_klu, tcp->u_arg[3]);
}
return 0;
}
@ -561,11 +561,11 @@ SYS_FUNC(rt_sigaction)
} else {
decode_new_sigaction(tcp, tcp->u_arg[2]);
#if defined(SPARC) || defined(SPARC64)
tprintf(", %#" PRI_krx ", %" PRI_kru, 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(", %" PRI_kru ", %#" PRI_krx, tcp->u_arg[3], tcp->u_arg[4]);
tprintf(", %" PRI_klu ", %#" PRI_klx, tcp->u_arg[3], tcp->u_arg[4]);
#else
tprintf(", %" PRI_kru, tcp->u_arg[3]);
tprintf(", %" PRI_klu, tcp->u_arg[3]);
#endif
}
return 0;
@ -582,7 +582,7 @@ SYS_FUNC(rt_sigpending)
*/
print_sigset_addr_len_limit(tcp, tcp->u_arg[0],
tcp->u_arg[1], 1);
tprintf(", %" PRI_kru, tcp->u_arg[1]);
tprintf(", %" PRI_klu, tcp->u_arg[1]);
}
return 0;
}
@ -591,7 +591,7 @@ 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(", %" PRI_kru, tcp->u_arg[1]);
tprintf(", %" PRI_klu, tcp->u_arg[1]);
return RVAL_DECODED;
}
@ -636,7 +636,7 @@ SYS_FUNC(rt_sigtimedwait)
printaddr(tcp->u_arg[1]);
tprints(", ");
print_timespec(tcp, tcp->u_arg[2]);
tprintf(", %" PRI_kru, 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);
@ -646,7 +646,7 @@ SYS_FUNC(rt_sigtimedwait)
printsiginfo_at(tcp, tcp->u_arg[1]);
tprints(", ");
tprints(get_tcb_priv_data(tcp));
tprintf(", %" PRI_kru, tcp->u_arg[3]);
tprintf(", %" PRI_klu, tcp->u_arg[3]);
}
if (!syserror(tcp) && tcp->u_rval) {

View File

@ -40,7 +40,7 @@ do_signalfd(struct tcb *tcp, int flags_arg)
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
print_sigset_addr_len(tcp, tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %" PRI_kru, tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
if (flags_arg >= 0) {
tprints(", ");
printflags(sfd_flags, tcp->u_arg[flags_arg], "SFD_???");

View File

@ -4,7 +4,7 @@ SYS_FUNC(statfs64)
{
if (entering(tcp)) {
printpath(tcp, tcp->u_arg[0]);
tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
} else {
print_struct_statfs64(tcp, tcp->u_arg[2], tcp->u_arg[1]);
}

View File

@ -822,7 +822,7 @@ trace_syscall_exiting(struct tcb *tcp)
if (syscall_fault_injected(tcp))
tprints(" (INJECTED)");
} else {
tprintf("= %#" PRI_krx, tcp->u_rval);
tprintf("= %#" PRI_klx, tcp->u_rval);
}
}
else if (!(sys_res & RVAL_NONE) && u_error) {
@ -907,7 +907,7 @@ trace_syscall_exiting(struct tcb *tcp)
(unsigned int) tcp->u_rval);
else
#endif
tprintf("= %#" PRI_krx, tcp->u_rval);
tprintf("= %#" PRI_klx, tcp->u_rval);
break;
case RVAL_OCTAL:
tprints("= ");
@ -920,10 +920,10 @@ trace_syscall_exiting(struct tcb *tcp)
(unsigned int) tcp->u_rval);
else
#endif
tprintf("= %" PRI_kru, tcp->u_rval);
tprintf("= %" PRI_klu, tcp->u_rval);
break;
case RVAL_DECIMAL:
tprintf("= %" PRI_krd, tcp->u_rval);
tprintf("= %" PRI_kld, tcp->u_rval);
break;
case RVAL_FD:
if (show_fd_path) {
@ -931,7 +931,7 @@ trace_syscall_exiting(struct tcb *tcp)
printfd(tcp, tcp->u_rval);
}
else
tprintf("= %" PRI_krd, tcp->u_rval);
tprintf("= %" PRI_kld, tcp->u_rval);
break;
#if HAVE_STRUCT_TCB_EXT_ARG
/*
@ -1059,7 +1059,7 @@ print_pc(struct tcb *tcp)
: "[????????????????] ");
else
tprintf(current_wordsize == 4
? "[%08" PRI_krx "] " : "[%016" PRI_krx "] ",
? "[%08" PRI_klx "] " : "[%016" PRI_klx "] ",
(kernel_ulong_t) ARCH_PC_REG);
}
@ -1229,7 +1229,7 @@ get_scno(struct tcb *tcp)
s->ent.sen = SEN_printargs;
s->ent.sys_func = printargs;
s->ent.sys_name = s->buf;
sprintf(s->buf, "syscall_%" PRI_kru, shuffle_scno(tcp->scno));
sprintf(s->buf, "syscall_%" PRI_klu, shuffle_scno(tcp->scno));
tcp->s_ent = &s->ent;
tcp->qual_flg = QUAL_RAW | DEFAULT_QUAL_FLAGS;
@ -1237,7 +1237,7 @@ get_scno(struct tcb *tcp)
set_tcb_priv_data(tcp, s, free_sysent_buf);
if (debug_flag)
error_msg("pid %d invalid syscall %" PRI_krd,
error_msg("pid %d invalid syscall %" PRI_kld,
tcp->pid, tcp->scno);
}
return 1;

View File

@ -62,7 +62,7 @@ SYS_FUNC(syslog)
break;
default:
printaddr(tcp->u_arg[1]);
tprintf(", %" PRI_kru, tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
return RVAL_DECODED;
}

View File

@ -65,14 +65,14 @@ SYS_FUNC(sysmips)
}
case MIPS_ATOMIC_SET:
printaddr(tcp->u_arg[1]);
tprintf(", %#" PRI_krx, tcp->u_arg[2]);
tprintf(", %#" PRI_klx, tcp->u_arg[2]);
return RVAL_DECODED;
case MIPS_FIXADE:
tprintf("%#" PRI_krx, tcp->u_arg[1]);
tprintf("%#" PRI_klx, tcp->u_arg[1]);
return RVAL_DECODED;
}
tprintf("%" PRI_krd ", %" PRI_krd ", %" PRI_krd,
tprintf("%" PRI_kld ", %" PRI_kld ", %" PRI_kld,
tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
return RVAL_DECODED;
}

View File

@ -3,7 +3,7 @@
SYS_FUNC(truncate)
{
printpath(tcp, tcp->u_arg[0]);
tprintf(", %" PRI_kru, tcp->u_arg[1]);
tprintf(", %" PRI_klu, tcp->u_arg[1]);
return RVAL_DECODED;
}
@ -19,7 +19,7 @@ SYS_FUNC(truncate64)
SYS_FUNC(ftruncate)
{
printfd(tcp, tcp->u_arg[0]);
tprintf(", %" PRI_kru, tcp->u_arg[1]);
tprintf(", %" PRI_klu, tcp->u_arg[1]);
return RVAL_DECODED;
}

18
util.c
View File

@ -956,7 +956,7 @@ dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ulong_t addr,
data_size -= iov_len;
/* include the buffer number to make it easy to
* match up the trace with the source */
tprintf(" * %" PRI_kru " bytes in buffer %d\n", iov_len, i);
tprintf(" * %" PRI_klu " bytes in buffer %d\n", iov_len, i);
dumpstr(tcp, iov_iov_base(i), iov_len);
}
}
@ -1127,7 +1127,7 @@ umoven(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len,
if ((unsigned int) r == len)
return 0;
if (r >= 0) {
error_msg("umoven: short read (%u < %u) @0x%" PRI_krx,
error_msg("umoven: short read (%u < %u) @0x%" PRI_klx,
(unsigned int) r, len, addr);
return -1;
}
@ -1169,7 +1169,7 @@ umoven(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len,
return -1;
default:
/* all the rest is strange and should be reported */
perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_krx,
perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
pid, addr);
return -1;
}
@ -1192,13 +1192,13 @@ umoven(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len,
case EFAULT: case EIO: case EPERM:
/* address space is inaccessible */
if (nread) {
perror_msg("umoven: short read (%u < %u) @0x%" PRI_krx,
perror_msg("umoven: short read (%u < %u) @0x%" PRI_klx,
nread, nread + len, addr - nread);
}
return -1;
default:
/* all the rest is strange and should be reported */
perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_krx,
perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
pid, addr);
return -1;
}
@ -1312,7 +1312,7 @@ umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *lad
case EFAULT: case EIO:
/* address space is inaccessible */
if (nread) {
perror_msg("umovestr: short read (%d < %d) @0x%" PRI_krx,
perror_msg("umovestr: short read (%d < %d) @0x%" PRI_klx,
nread, nread + len, addr - nread);
}
return -1;
@ -1343,7 +1343,7 @@ umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *lad
return -1;
default:
/* all the rest is strange and should be reported */
perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_krx,
perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
pid, addr);
return -1;
}
@ -1370,13 +1370,13 @@ umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *lad
case EFAULT: case EIO: case EPERM:
/* address space is inaccessible */
if (nread) {
perror_msg("umovestr: short read (%d < %d) @0x%" PRI_krx,
perror_msg("umovestr: short read (%d < %d) @0x%" PRI_klx,
nread, nread + len, addr - nread);
}
return -1;
default:
/* all the rest is strange and should be reported */
perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_krx,
perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
pid, addr);
return -1;
}

View File

@ -51,7 +51,7 @@ print_xattr_val(struct tcb *const tcp,
printaddr(addr);
else
printstr_ex(tcp, addr, size, QUOTE_OMIT_TRAILING_0);
tprintf(", %" PRI_kru, insize);
tprintf(", %" PRI_klu, insize);
}
SYS_FUNC(setxattr)
@ -109,7 +109,7 @@ print_xattr_list(struct tcb *const tcp, const kernel_ulong_t addr,
} else {
printstrn(tcp, addr, tcp->u_rval);
}
tprintf(", %" PRI_kru, size);
tprintf(", %" PRI_klu, size);
}
SYS_FUNC(listxattr)