Changed to use %p.

1 files changed, 87 insertions, 87 deletions

diff --git a/tapset/ppc64/syscalls.stp b/tapset/ppc64/syscalls.stp
index 9624fd3c..0a9d70f6 100644
--- a/tapset/ppc64/syscalls.stp
+++ b/tapset/ppc64/syscalls.stp
@@ -8,7 +8,7 @@ probe syscall.compat_sys_nanosleep = kernel.function("compat_sys_nanosleep") {
 	name = "compat_sys_nanosleep"
 	rqtp_uaddr = $rqtp
 	rmtp_uaddr = $rmtp
-	argstr = sprintf("[0x%x], [0x%x]", rqtp_uaddr, rmtp_uaddr)
+	argstr = sprintf("[0x%p], [0x%p]", rqtp_uaddr, rmtp_uaddr)
 }
 probe syscall.compat_sys_nanosleep.return =
 	kernel.function("compat_sys_nanosleep").return {
@@ -24,7 +24,7 @@ probe syscall.compat_sys_getitimer = kernel.function("compat_sys_getitimer") {
 	name = "compat_sys_getitimer"
 	which = $which
 	value_uaddr = $it
-	argstr = sprintf("%s, [0x%x]", _itimer_which_str(which), value_uaddr)
+	argstr = sprintf("%s, [0x%p]", _itimer_which_str(which), value_uaddr)
 }
 probe syscall.compat_sys_getitimer.return =
 	kernel.function("compat_sys_getitimer").return {
@@ -42,7 +42,7 @@ probe syscall.compat_sys_setitimer = kernel.function("compat_sys_setitimer") {
 	which = $which
 	value_uaddr = $in
 	ovalue_uaddr = $out
-	argstr = sprintf("%s, %s, 0x%x", _itimer_which_str($which),
+	argstr = sprintf("%s, %s, 0x%p", _itimer_which_str($which),
 			_struct_itimerval_u($in), $out)
 }
 probe syscall.compat_sys_setitimer.return =
@@ -57,7 +57,7 @@ probe syscall.compat_sys_setitimer.return =
 probe syscall.compat_sys_times = kernel.function("compat_sys_times") {
 	name = "compat_sys_times"
 	buf_uaddr = $tbuf
-	argstr = sprintf("[0x%x]", buf_uaddr)
+	argstr = sprintf("[0x%p]", buf_uaddr)
 }
 probe syscall.compat_sys_times.return =
 	kernel.function("compat_sys_times").return {
@@ -71,7 +71,7 @@ probe syscall.compat_sys_times.return =
 probe syscall.compat_sys_sigpending = kernel.function("compat_sys_sigpending") {
 	name = "compat_sys_sigpending"
 	set_uaddr = $set
-	argstr = sprintf("[0x%x]", set_uaddr)
+	argstr = sprintf("[0x%p]", set_uaddr)
 }
 probe syscall.compat_sys_sigpending.return =
 	kernel.function("compat_sys_sigpending").return {
@@ -89,7 +89,7 @@ probe syscall.compat_sys_sigprocmask = kernel.function("compat_sys_sigprocmask")
 	how  = $how
 	set_uaddr = $set
 	oldset_uaddr = $oset
-	argstr = sprintf("%s, [0x%x], [0x%x]", _sigprocmask_how_str($how),
+	argstr = sprintf("%s, [0x%p], [0x%p]", _sigprocmask_how_str($how),
 			set_uaddr, oldset_uaddr)
 }
 probe syscall.compat_sys_sigprocmask.return =
@@ -111,7 +111,7 @@ probe syscall.compat_sys_futex = kernel.function("compat_sys_futex") {
 	utime_uaddr = $utime
 	uaddr2_uaddr = $uaddr2
 	val3 = $val3
-	argstr = sprintf("0x%x, %s, %d, %s", $uaddr, _futex_op_str($op),
+	argstr = sprintf("0x%p, %s, %d, %s", $uaddr, _futex_op_str($op),
 				$val, _struct_timespec_u($utime))
 }
 probe syscall.compat_sys_futex.return =
@@ -179,7 +179,7 @@ probe syscall.compat_sys_getrusage = kernel.function("compat_sys_getrusage") {
 	name = "compat_sys_getrusage"
 	who = $who
 	usage_uaddr = $ru
-	argstr = sprintf("%s, [0x%x]",_rusage_who_str($who), usage_uaddr)
+	argstr = sprintf("%s, [0x%p]",_rusage_who_str($who), usage_uaddr)
 }
 probe syscall.compat_sys_getrusage.return =
 	kernel.function("compat_sys_getrusage").return {
@@ -197,7 +197,7 @@ probe syscall.compat_sys_wait4 = kernel.function("compat_sys_wait4") {
 	status_uaddr = $stat_addr
 	options = $options
 	rusage_uaddr = $ru
-	argstr = sprintf("%d, [0x%x], %s, [0x%x]", $pid, status_uaddr,
+	argstr = sprintf("%d, [0x%p], %s, [0x%p]", $pid, status_uaddr,
 			_wait4_opt_str($options), rusage_uaddr)
 }
 probe syscall.compat_sys_wait4.return =
@@ -216,7 +216,7 @@ probe syscall.compat_sys_sched_setaffinity = kernel.function("compat_sys_sched_s
 	pid = $pid
 	len = $len
 	mask_uaddr = $user_mask_ptr
-	argstr = sprintf("%d, %d, [0x%x]", pid, len, mask_uaddr)
+	argstr = sprintf("%d, %d, [0x%p]", pid, len, mask_uaddr)
 }
 probe syscall.compat_sys_sched_setaffinity.return =
 	kernel.function("compat_sys_sched_setaffinity").return {
@@ -234,7 +234,7 @@ probe syscall.compat_sys_sched_getaffinity = kernel.function("compat_sys_sched_g
 	pid = $pid
 	len = $len
 	mask_uaddr = $user_mask_ptr
-	argstr = sprintf("%d, %d, [0x%x]", pid, len, mask_uaddr)
+	argstr = sprintf("%d, %d, [0x%p]", pid, len, mask_uaddr)
 }
 probe syscall.compat_sys_sched_getaffinity.return =
 	kernel.function("compat_sys_sched_getaffinity").return {
@@ -250,7 +250,7 @@ probe syscall.compat_sys_utime = kernel.function("compat_sys_utime") {
 	name = "compat_sys_utime"
 	filename = user_string($filename)
 	buf_uaddr = $t
-	argstr = sprintf("%s, [0x%x]", filename, buf_uaddr)
+	argstr = sprintf("%s, [0x%p]", filename, buf_uaddr)
 }
 probe syscall.compat_sys_utime.return =
 	kernel.function("compat_sys_utime").return {
@@ -282,7 +282,7 @@ probe syscall.compat_sys_newstat = kernel.function("compat_sys_newstat") {
 	name = "compat_sys_newstat"
 	file_name = user_string($filename)
 	buf_uaddr = $statbuf
-	argstr = sprintf("\"%s\", [0x%x]", file_name, buf_uaddr)
+	argstr = sprintf("\"%s\", [0x%p]", file_name, buf_uaddr)
 }
 probe syscall.compat_sys_newstat.return =
 	kernel.function("compat_sys_newstat").return {
@@ -298,7 +298,7 @@ probe syscall.compat_sys_newlstat = kernel.function("compat_sys_newlstat") {
 	name = "compat_sys_newlstat"
 	file_name = user_string($filename)
 	buf_uaddr = $statbuf
-	argstr = sprintf("\"%s\", [0x%x]", file_name, buf_uaddr)
+	argstr = sprintf("\"%s\", [0x%p]", file_name, buf_uaddr)
 }
 probe syscall.compat_sys_newlstat.return =
 	kernel.function("compat_sys_newlstat").return {
@@ -314,7 +314,7 @@ probe syscall.compat_sys_newfstat = kernel.function("compat_sys_newfstat") {
 	name = "compat_sys_newfstat"
 	filedes = $fd
 	buf_uaddr = $statbuf
-	argstr = sprintf("%d, [0x%x]", filedes, buf_uaddr)
+	argstr = sprintf("%d, [0x%p]", filedes, buf_uaddr)
 }
 probe syscall.compat_sys_newfstat.return =
 	kernel.function("compat_sys_newfstat").return {
@@ -330,7 +330,7 @@ probe syscall.compat_sys_statfs = kernel.function("compat_sys_statfs") {
 	name = "compat_sys_statfs"
 	path = user_string($path)
 	buf_uaddr = $buf
-	argstr = sprintf("%s, [0x%x]", path, buf_uaddr)
+	argstr = sprintf("%s, [0x%p]", path, buf_uaddr)
 }
 probe syscall.compat_sys_statfs.return =
 	kernel.function("compat_sys_statfs").return {
@@ -346,7 +346,7 @@ probe syscall.compat_sys_fstatfs = kernel.function("compat_sys_fstatfs") {
 	name = "compat_sys_fstatfs"
 	fd = $fd
 	buf_uaddr = $buf
-	argstr = sprintf("%d, [0x%x]", fd, buf_uaddr)
+	argstr = sprintf("%d, [0x%p]", fd, buf_uaddr)
 }
 probe syscall.compat_sys_fstatfs.return =
 	kernel.function("compat_sys_fstatfs").return {
@@ -363,7 +363,7 @@ probe syscall.compat_sys_ioctl = kernel.function("compat_sys_ioctl") {
 	d = $fd
 	request = cmd
 	arg = $arg
-	argstr = sprintf("%d, %d, [0x%x]", fd, request, arg)
+	argstr = sprintf("%d, %d, [0x%p]", fd, request, arg)
 }
 probe syscall.compat_sys_ioctl.return =
 	kernel.function("compat_sys_ioctl").return {
@@ -380,7 +380,7 @@ probe syscall.compat_sys_fcntl64 = kernel.function("compat_sys_fcntl64") {
 	fd = $fd
 	cmd = $cmd
 	arg = $arg
-	argstr = sprintf("%d, %s, [0x%x]", fd, _fcntl_cmd_str($cmd), arg)
+	argstr = sprintf("%d, %s, [0x%p]", fd, _fcntl_cmd_str($cmd), arg)
 }
 probe syscall.compat_sys_fcntl64.return =
 	kernel.function("compat_sys_fcntl64").return {
@@ -397,7 +397,7 @@ probe syscall.compat_sys_fcntl = kernel.function("compat_sys_fcntl") {
 	fd = $fd
 	cmd = $cmd
 	arg = $arg
-	argstr = sprintf("%d, %s, 0x%x", fd, _fcntl_cmd_str($cmd), arg)
+	argstr = sprintf("%d, %s, 0x%p", fd, _fcntl_cmd_str($cmd), arg)
 }
 probe syscall.compat_sys_fcntl.return =
 	kernel.function("compat_sys_fcntl").return {
@@ -412,7 +412,7 @@ probe syscall.compat_sys_io_setup = kernel.function("compat_sys_io_setup") {
 	name = "compat_sys_io_setup"
 	maxevents = $nr_reqs
 	ctxp_uaddr = $ctx32p
-	argstr = sprintf("%d, [0x%x]", maxevents, ctxp_uaddr)
+	argstr = sprintf("%d, [0x%p]", maxevents, ctxp_uaddr)
 }
 probe syscall.compat_sys_io_setup.return =
 	kernel.function("compat_sys_io_setup").return {
@@ -434,7 +434,7 @@ probe syscall.compat_sys_io_getevents = kernel.function("compat_sys_io_getevents
 	nr = $nr
 	events_uaddr = $events
 	timeout_uaddr = $timeout
-	argstr = sprintf("%d, %d, %d, [0x%x],[0x%x]", ctx_id, min_nr, nr,
+	argstr = sprintf("%d, %d, %d, [0x%p],[0x%p]", ctx_id, min_nr, nr,
 				events_uaddr, timeout_uaddr)
 }
 probe syscall.compat_sys_io_getevents.return =
@@ -452,7 +452,7 @@ probe syscall.compat_sys_io_submit = kernel.function("compat_sys_io_submit") {
 	ctx_id = $ctx_id
 	nr = $nr
 	iocbpp_uaddr = iocb
-	argstr = sprintf("%d, %d, [0x%x]", ctx_id, nr, iocbpp_uaddr)
+	argstr = sprintf("%d, %d, [0x%p]", ctx_id, nr, iocbpp_uaddr)
 }
 probe syscall.compat_sys_io_submit.return =
 	kernel.function("compat_sys_io_submit").return {
@@ -474,7 +474,7 @@ probe syscall.compat_sys_mount = kernel.function("compat_sys_mount") {
 	filesystemtype = user_string($type)
 	mountflags = $flags
 	data_uaddr = $data
-	argstr = sprintf("\"%s\", \"%s\", \"%s\", %s, [0x%x]", source,
+	argstr = sprintf("\"%s\", \"%s\", \"%s\", %s, [0x%p]", source,
 			target, filesystemtype, _mountflags_str($flags),
 			data_uaddr)
 }
@@ -494,7 +494,7 @@ probe syscall.compat_sys_getdents = kernel.function("compat_sys_getdents") {
 	fd = $fd
 	dirent_uaddr = $dirent
 	count = $count
-	argstr = sprintf("%d, [0x%x], %d", fd, dirp_uaddr, count)
+	argstr = sprintf("%d, [0x%p], %d", fd, dirp_uaddr, count)
 }
 probe syscall.compat_sys_getdents.return =
 	kernel.function("compat_sys_getdents").return {
@@ -512,7 +512,7 @@ probe syscall.compat_sys_getdents64 = kernel.function("compat_sys_getdents64") {
 	fd = $fd
 	dirent_uaddr = $dirent
 	count = $count
-	argstr = sprintf("%d, [0x%x], %d", fd, dirp_uaddr, count)
+	argstr = sprintf("%d, [0x%p], %d", fd, dirp_uaddr, count)
 }
 probe syscall.compat_sys_getdents64.return =
 	kernel.function("compat_sys_getdents64").return {
@@ -531,7 +531,7 @@ probe syscall.compat_sys_readv = kernel.function("compat_sys_readv") {
 #	fd = $fd
 	vector_uaddr = $vec
 	count = $vlen
-	argstr = sprintf("unknown fd, [0x%x], 0x%x", vector_uaddr, count)
+	argstr = sprintf("unknown fd, [0x%p], 0x%p", vector_uaddr, count)
 }
 probe syscall.compat_sys_readv.return =
 	kernel.function("compat_sys_readv").return {
@@ -550,7 +550,7 @@ probe syscall.compat_sys_writev = kernel.function("compat_sys_writev") {
 #	fd = $fd
 	vector_uaddr = $vec
 	count = $vlen
-	argstr = sprintf("unknown fd, [0x%x], %d", vector_uaddr, $vlen)
+	argstr = sprintf("unknown fd, [0x%p], %d", vector_uaddr, $vlen)
 }
 probe syscall.compat_sys_writev.return =
 	kernel.function("compat_sys_writev").return {
@@ -594,7 +594,7 @@ probe syscall.compat_sys_nfsservctl = kernel.function("compat_sys_nfsservctl") {
 	cmd = $cmd
 	argp_uaddr = $arg
 	resp_uaddr = $res
-	argstr = sprintf("0x%x, [0x%x], [0x%x]", cmd, argp_uaddr, resp_uaddr)
+	argstr = sprintf("0x%p, [0x%p], [0x%p]", cmd, argp_uaddr, resp_uaddr)
 }
 probe syscall.compat_sys_nfsservctl.return =
 	kernel.function("compat_sys_nfsservctl").return {
@@ -628,7 +628,7 @@ probe syscall.compat_sys_msgsnd = kernel.function("compat_sys_msgsnd") {
 	second = $second
 	third = $third
 	uptr_uaddr = $uptr
-	argstr = sprintf("%d, %d, %d, [0x%x]", first, second, third,
+	argstr = sprintf("%d, %d, %d, [0x%p]", first, second, third,
 				uptr_uaddr)
 }
 probe syscall.compat_sys_msgsnd.return =
@@ -647,7 +647,7 @@ probe syscall.compat_sys_msgrcv = kernel.function("compat_sys_msgrcv") {
 	second = $second
 	third = $third
 	uptr_uaddr = $uptr
-	argstr = sprintf("%d, %d, %d, [0x%x]", first, second, third,
+	argstr = sprintf("%d, %d, %d, [0x%p]", first, second, third,
 				uptr_uaddr)
 }
 probe syscall.compat_sys_msgrcv.return =
@@ -664,7 +664,7 @@ probe syscall.compat_sys_msgctl = kernel.function("compat_sys_msgctl") {
 	first = $first
 	second = $second
 	uptr_uaddr = $uptr
-	argstr = sprintf("%d, %d, [0x%x]", first, second, uptr_uaddr)
+	argstr = sprintf("%d, %d, [0x%p]", first, second, uptr_uaddr)
 }
 probe syscall.compat_sys_msgctl.return =
 	kernel.function("compat_sys_msgctl").return {
@@ -682,7 +682,7 @@ probe syscall.compat_sys_shmat = kernel.function("compat_sys_shmat") {
 	second = $second
 	third = $third
 	uptr_uaddr = $uptr
-	argstr = sprintf("%d, %d, %d, [0x%x]", first, second, third,
+	argstr = sprintf("%d, %d, %d, [0x%p]", first, second, third,
 				uptr_uaddr)
 }
 probe syscall.compat_sys_shmat.return =
@@ -699,7 +699,7 @@ probe syscall.compat_sys_shmctl = kernel.function("compat_sys_shmctl") {
 	first = $first
 	second = $second
 	uptr_uaddr = $uptr
-	argstr = sprintf("%d, %d, [0x%x]", first, second, uptr_uaddr)
+	argstr = sprintf("%d, %d, [0x%p]", first, second, uptr_uaddr)
 }
 probe syscall.compat_sys_shmctl.return =
 	kernel.function("compat_sys_shmctl").return {
@@ -717,7 +717,7 @@ probe syscall.compat_sys_semtimedop = kernel.function("compat_sys_semtimedop") {
 	sops_uaddr = tsems
 	nsops = $nsops
 	timeout_uaddr = $timeout
-	argstr = sprintf("%d, [0x%x], %d, %s", semid, sops_uaddr, nsops,
+	argstr = sprintf("%d, [0x%p], %d, %s", semid, sops_uaddr, nsops,
 			_struct_timespec_u(timeout_uaddr))
 }
 probe syscall.compat_sys_semtimedop.return =
@@ -738,7 +738,7 @@ probe syscall.compat_sys_mq_open = kernel.function("compat_sys_mq_open") {
 	oflag = $oflag
 	mode = $mode
 	u_attr_uaddr = $u_attr
-	argstr = sprintf("\"%s\", %d, %d, [0x%x]", name_str, oflag, mode,
+	argstr = sprintf("\"%s\", %d, %d, [0x%p]", name_str, oflag, mode,
 				u_attr_uaddr) 
 }
 probe syscall.compat_sys_mq_open.return =
@@ -797,7 +797,7 @@ probe syscall.compat_sys_mq_notify = kernel.function("compat_sys_mq_notify") {
 	name = "compat_sys_mq_notify"
 	mqdes = $mqdes
 	notification_uaddr = $u_notification
-	argstr = sprintf("%d, [0x%x]", mqdes, notification_uaddr)
+	argstr = sprintf("%d, [0x%p]", mqdes, notification_uaddr)
 }
 probe syscall.compat_sys_mq_notify.return =
 	kernel.function("compat_sys_mq_notify").return {
@@ -816,7 +816,7 @@ probe syscall.compat_sys_mq_getsetattr =
 	mqdes = $mqdes
 	u_mqstat_uaddr = $u_mqstat
 	u_omqstat_uaddr = $u_omqstat
-	argstr = sprintf("%d, [0x%x], [0x%x]", mqdes, u_mqstat_uaddr,
+	argstr = sprintf("%d, [0x%p], [0x%p]", mqdes, u_mqstat_uaddr,
 				u_omqstat_uaddr)
 }
 probe syscall.compat_sys_mq_getsetattr.return =
@@ -860,7 +860,7 @@ probe syscall.compat_sys_setsockopt = kernel.function("compat_sys_setsockopt") {
 	optname_str = _sockopt_optname_str($optname)
 	optval_uaddr = $optval
 	optlen = $optlen
-	argstr = sprintf("%d, %s, %s, [0x%x], %d", $fd, level_str,
+	argstr = sprintf("%d, %s, %s, [0x%p], %d", $fd, level_str,
 				optname_str, optval_uaddr, $optlen)
 }
 probe syscall.compat_sys_setsockopt.return =
@@ -883,7 +883,7 @@ probe syscall.compat_sys_getsockopt = kernel.function("compat_sys_getsockopt") {
 	optval_uaddr = $optval
 	/* FIXME */
 	optlen_uaddr = $optlen
-	argstr = sprintf("%d, %s, %s, [0x%x], [0x%x]", s, level_str,
+	argstr = sprintf("%d, %s, %s, [0x%p], [0x%p]", s, level_str,
 			optname_str, optval_uaddr, optlen_uaddr)
 }
 probe syscall.compat_sys_getsockopt.return =
@@ -902,7 +902,7 @@ probe syscall.compat_sys_sendmsg = kernel.function("compat_sys_sendmsg") {
 	s = $fd
 	msg_uaddr = $msg
 	flags = $flags
-	argstr = sprintf("%d, [0x%x], %s", s, msg_uaddr,
+	argstr = sprintf("%d, [0x%p], %s", s, msg_uaddr,
 				_send_flags_str($flags))
 }
 probe syscall.compat_sys_sendmsg.return =
@@ -921,7 +921,7 @@ probe syscall.compat_sys_recvmsg = kernel.function("compat_sys_recvmsg") {
 	s = $fd
 	msg_uaddr = $msg
 	flags = $flags
-	argstr = sprintf("%d, [0x%x], %s", s, msg_uaddr,
+	argstr = sprintf("%d, [0x%p], %s", s, msg_uaddr,
 				_send_flags_str($flags))
 }
 probe syscall.compat_sys_recvmsg.return =
@@ -937,7 +937,7 @@ probe syscall.compat_sys_socketcall = kernel.function("compat_sys_socketcall") {
 	name = "compat_sys_socketcall"
 	call = $call
 	args_uaddr = $args
-	argstr = sprintf("%d, [0x%x]", call, args_uaddr)
+	argstr = sprintf("%d, [0x%p]", call, args_uaddr)
 }
 probe syscall.compat_sys_socketcall.return =
 	kernel.function("compat_sys_socketcall").return {
@@ -998,7 +998,7 @@ probe syscall.quotactl = kernel.function("sys_quotactl") {
 	special_str = user_string($special)
 	id = $id
 	addr_uaddr = $addr
-	argstr = sprintf("%s, %s, 0x%x, [0x%x]", cmd_str, special_str,
+	argstr = sprintf("%s, %s, 0x%p, [0x%p]", cmd_str, special_str,
 				id, addr_uaddr)
 }
 probe syscall.quotactl.return = kernel.function("sys_quotactl").return {
@@ -1019,7 +1019,7 @@ probe syscall.request_key = kernel.function("sys_request_key") {
 	description_uaddr = $_description
 	callout_info_uaddr = $_callout_info
 	destringid = $destringid
-	argstr = sprintf("[0x%x], [0x%x], [0x%x], 0x%x", type_uaddr,
+	argstr = sprintf("[0x%p], [0x%p], [0x%p], 0x%p", type_uaddr,
 			description_uaddr, callout_info_uaddr, destringid)
 }
 probe syscall.request_key.return = kernel.function("sys_request_key").return {
@@ -1053,7 +1053,7 @@ probe syscall.sys32_time = kernel.function("sys32_time") {
 	name = "sys32_time"
 	/* FIXME */
 	t_uaddr = $tloc
-	argstr = sprintf("[0x%x]", t_uaddr)
+	argstr = sprintf("[0x%p]", t_uaddr)
 }
 probe syscall.sys32_time.return = kernel.function("sys32_time").return {
 	name = "sys32_time"
@@ -1068,7 +1068,7 @@ probe syscall.ppc64_sys32_stime = kernel.function("ppc64_sys32_stime") {
 	name = "ppc64_sys32_stime"
 	/* FIXME */
 	t_uaddr = $tptr
-	argstr = sprintf("[0x%x]", t_uaddr)
+	argstr = sprintf("[0x%p]", t_uaddr)
 }
 probe syscall.ppc64_sys32_stime.return =
 	kernel.function("ppc64_sys32_stime").return {
@@ -1087,7 +1087,7 @@ probe syscall.sys32_ptrace = kernel.function("sys32_ptrace") {
 	pid = $pid
 	addr = $addr
 	data = $data
-	argstr = sprintf("0x%x, 0x%x, 0x%x, 0x%x", request, pid,
+	argstr = sprintf("0x%p, 0x%p, 0x%p, 0x%p", request, pid,
 				addr, data)
 }
 probe syscall.sys32_ptrace.return = kernel.function("sys32_ptrace").return {
@@ -1113,7 +1113,7 @@ probe syscall.sys32_pause.return = kernel.function("sys32_pause").return {
 probe syscall.sys32_olduname = kernel.function("sys32_olduname") {
 	name = "sys32_olduname"
 	name_uaddr = $name
-	argstr = sprintf("[0x%x]", name_uaddr)
+	argstr = sprintf("[0x%p]", name_uaddr)
 }
 probe syscall.sys32_olduname.return = kernel.function("sys32_olduname").return {
 	name = "sys32_olduname"
@@ -1129,7 +1129,7 @@ probe syscall.sys32_sigaction = kernel.function("sys32_sigaction") {
 	sig = $sig
 	act_uaddr = $act
 	oact_uaddr = $oact
-	argstr = sprintf("%s, [0x%x], [0x%x]", _signal_name($sig),
+	argstr = sprintf("%s, [0x%p], [0x%p]", _signal_name($sig),
 			act_uaddr, oact_uaddr)
 }
 probe syscall.sys32_sigaction.return =
@@ -1145,7 +1145,7 @@ probe syscall.sys32_sigaction.return =
 probe syscall.sys32_sigsuspend = kernel.function("sys32_sigsuspend") {
 	name = "sys32_sigsuspend"
 	mask = $mask
-	argstr = sprintf("0x%x", mask)
+	argstr = sprintf("0x%p", mask)
 }
 probe syscall.sys32_sigsuspend.return =
 	kernel.function("sys32_sigsuspend").return {
@@ -1161,7 +1161,7 @@ probe syscall.sys32_gettimeofday = kernel.function("sys32_gettimeofday") {
 	name = "sys32_gettimeofday"
 	tv_uaddr = $tv
 	tz_uaddr = $tz
-	argstr = sprintf("[0x%x], [0x%x]", tv_uaddr, tz_uaddr)
+	argstr = sprintf("[0x%p], [0x%p]", tv_uaddr, tz_uaddr)
 }
 probe syscall.sys32_gettimeofday.return =
 	kernel.function("sys32_gettimeofday").return {
@@ -1177,7 +1177,7 @@ probe syscall.sys32_settimeofday = kernel.function("sys32_settimeofday") {
 	name = "sys32_settimeofday"
 	tv_uaddr = $tv
 	tz_uaddr = $tz
-	argstr = sprintf("[0x%x], [0x%x]", tv_uaddr, tz_uaddr)
+	argstr = sprintf("[0x%p], [0x%p]", tv_uaddr, tz_uaddr)
 }
 probe syscall.sys32_settimeofday.return =
 	kernel.function("sys32_settimeofday").return {
@@ -1191,7 +1191,7 @@ probe syscall.sys32_settimeofday.return =
 probe syscall.sys32_sysinfo = kernel.function("sys32_sysinfo") {
 	name = "sys32_sysinfo"
 	info_uaddr = $info
-	argstr = sprintf("[0x%x]", info_uaddr)
+	argstr = sprintf("[0x%p]", info_uaddr)
 }
 probe syscall.sys32_sysinfo.return =
 	kernel.function("sys32_sysinfo").return {
@@ -1211,7 +1211,7 @@ probe syscall.sys32_ipc = kernel.function("sys32_ipc") {
 	third = $third
 	ptr_uaddr = $ptr
 	fifth = $fifth
-	argstr = sprintf("%d, %d, %d, %d, [0x%x], %d", call, first, second,
+	argstr = sprintf("%d, %d, %d, %d, [0x%p], %d", call, first, second,
 				third, ptr_uaddr, fifth) 
 }
 probe syscall.sys32_ipc.return = kernel.function("sys32_ipc").return {
@@ -1231,7 +1231,7 @@ probe syscall.sys32_sigreturn = kernel.function("sys32_sigreturn") {
 	r6 = $r6
 	r7 = $r7
 	r8 = $r8
-	argstr = sprintf("0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x",
+	argstr = sprintf("0x%p, 0x%p, 0x%p, 0x%p, 0x%p, 0x%p",
 				 r3, r4, r5, r6, r7, r8)
 }
 probe syscall.sys32_sigreturn.return =
@@ -1246,7 +1246,7 @@ probe syscall.sys32_sigreturn.return =
 probe syscall.sys32_adjtimex = kernel.function("sys32_adjtimex") {
 	name = "sys32_adjtimex"
 	buf_uaddr = $utp
-	argstr = sprintf("[0x%x]", buf_uaddr)
+	argstr = sprintf("[0x%p]", buf_uaddr)
 }
 probe syscall.sys32_adjtimex.return = kernel.function("sys32_adjtimex").return {
 	name = "sys32_adjtimex"
@@ -1263,7 +1263,7 @@ probe syscall.sys32_getdents = kernel.function("sys32_getdents") {
 	fd = $fd
 	dirp_uaddr = $dirent
 	count = $count
-	argstr = sprintf("%d, [0x%x], %d", fd, dirp_uaddr, count)
+	argstr = sprintf("%d, [0x%p], %d", fd, dirp_uaddr, count)
 }
 probe syscall.sys32_getdents.return =
 	kernel.function("sys32_getdents").return {
@@ -1277,7 +1277,7 @@ probe syscall.sys32_getdents.return =
 probe syscall.sys32_sysctl = kernel.function("sys32_sysctl") {
 	name = "sys32_sysctl"
 	args_uaddr = $args
-	argstr = sprintf("[0x%x]", args_uaddr)
+	argstr = sprintf("[0x%p]", args_uaddr)
 }
 probe syscall.sys32_sysctl.return =
 	kernel.function("sys32_sysctl").return {
@@ -1293,7 +1293,7 @@ probe syscall.sys32_sched_setparam = kernel.function("sys32_sched_setparam") {
 	name = "sys32_sched_setparam"
 	pid = $pid
 	param_uaddr = $param
-	argstr = sprintf("%d, [0x%x]", pid, param_uaddr)
+	argstr = sprintf("%d, [0x%p]", pid, param_uaddr)
 }
 probe syscall.sys32_sched_setparam.return =
 	kernel.function("sys32_sched_setparam").return {
@@ -1310,7 +1310,7 @@ probe syscall.sys32_sched_rr_get_interval = kernel.function("sys32_sched_rr_get_
 	name = "sys32_sched_rr_get_interval"
 	pid = $pid
 	interval_uaddr = $interval
-	argstr = sprintf("%d, [0x%x]", pid, interval_uaddr)  
+	argstr = sprintf("%d, [0x%p]", pid, interval_uaddr)  
 }
 probe syscall.sys32_sched_rr_get_interval.return =
 	kernel.function("sys32_sched_rr_get_interval").return {
@@ -1331,7 +1331,7 @@ probe syscall.sys32_rt_sigreturn = kernel.function("sys32_rt_sigreturn") {
 	r6 = $r6
 	r7 = $r7
 	r8 = $r8
-	argstr = sprintf("0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x",
+	argstr = sprintf("0x%p, 0x%p, 0x%p, 0x%p, 0x%p, 0x%p",
 				r3, r4, r5, r6, r7, r8)
 }
 probe syscall.sys32_rt_sigreturn.return =
@@ -1350,7 +1350,7 @@ probe syscall.sys32_rt_sigaction = kernel.function("sys32_rt_sigaction") {
 	act_uaddr = $act
 	oact_uaddr = $oact
 	sigsetsize = $sigsetsize
-	argstr = sprintf("%s, [0x%x], [0x%x], 0x%x", _signal_name($sig),
+	argstr = sprintf("%s, [0x%p], [0x%p], 0x%p", _signal_name($sig),
 				act_uaddr, oact_uaddr, sigsetsize)
 }
 probe syscall.sys32_rt_sigaction.return =
@@ -1370,7 +1370,7 @@ probe syscall.sys32_rt_sigprocmask = kernel.function("sys32_rt_sigprocmask") {
 	set_uaddr = $set
 	oset_uaddr = $oset
 	sigsetsize = $sigsetsize
-	argstr = sprintf("%s, [0x%x], [0x%x], 0x%x", how_str, set_uaddr,
+	argstr = sprintf("%s, [0x%p], [0x%p], 0x%p", how_str, set_uaddr,
 				oset_uaddr, sigsetsize)
 }
 probe syscall.sys32_rt_sigprocmask.return =
@@ -1387,7 +1387,7 @@ probe syscall.sys32_rt_sigpending = kernel.function("sys32_rt_sigpending") {
 	name = "sys32_rt_sigpending"
 	set_uaddr = $set
 	sigsetsize = $sigsetsize
-	argstr = sprintf("[0x%x], %d", set_uaddr, $sigsetsize)
+	argstr = sprintf("[0x%p], %d", set_uaddr, $sigsetsize)
 }
 probe syscall.sys32_rt_sigpending.return =
 	kernel.function("sys32_rt_sigpending").return {
@@ -1407,7 +1407,7 @@ probe syscall.sys32_rt_sigtimedwait = kernel.function("sys32_rt_sigtimedwait") {
 	uinfo_uaddr = $uinfo
 	uts_uaddr = $uts
 	sigsetsize = $sigsetsize
-	argstr = sprintf("[0x%x], [0x%x], [0x%x], 0x%x", uthese_uaddr,
+	argstr = sprintf("[0x%p], [0x%p], [0x%p], 0x%p", uthese_uaddr,
 			uinfo_uaddr, uts_uaddr, sigsetsize)
 }
 probe syscall.sys32_rt_sigtimedwait.return =
@@ -1424,7 +1424,7 @@ probe syscall.sys32_rt_sigqueueinfo = kernel.function("sys32_rt_sigqueueinfo") {
 	pid = $pid
 	sig = $sig
 	uinfo_uaddr = $uinfo
-	argstr = sprintf("0x%x, %s, [0x%x]", pid, _signal_name($sig),
+	argstr = sprintf("0x%p, %s, [0x%p]", pid, _signal_name($sig),
 				uinfo_uaddr)
 }
 probe syscall.sys32_rt_sigqueueinfo.return =
@@ -1457,7 +1457,7 @@ probe syscall.sys32_sendfile64 = kernel.function("sys32_sendfile64") {
 	in_fd = $in_fd
 	offset_uaddr = $offset
 	count = $count
-	argstr = sprintf("%d, %d, [0x%x], %d", $out_fd, $in_fd, offset_uaddr,
+	argstr = sprintf("%d, %d, [0x%p], %d", $out_fd, $in_fd, offset_uaddr,
 				$count)
 }
 probe syscall.sys32_sendfile64.return =
@@ -1476,7 +1476,7 @@ probe syscall.ppc32_timer_create = kernel.function("ppc32_timer_create") {
 	which_clock = $clock
 	timer_event_spec = $ev32
 	created_timer_id = $timer_id
-	argstr = sprintf("%d, [0x%x], [0x%x]", which_clock, timer_event_spec,
+	argstr = sprintf("%d, [0x%p], [0x%p]", which_clock, timer_event_spec,
 				created_timer_id)
 }
 probe syscall.ppc32_timer_create.return =
@@ -1496,7 +1496,7 @@ probe syscall.compat_timer_settime = kernel.function("compat_timer_settime") {
 	flags = $flags
 	new_setting_uaddr = $new
 	old_setting_uaddr = $old
-	argstr = sprintf("%d, %d, [0x%x], [0x%x]", timer_id, flags,
+	argstr = sprintf("%d, %d, [0x%p], [0x%p]", timer_id, flags,
 				new_setting_uaddr, old_setting_uaddr)
 }
 probe syscall.compat_timer_settime.return =
@@ -1513,7 +1513,7 @@ probe syscall.compat_timer_gettime = kernel.function("compat_timer_gettime") {
 	name = "compat_timer_gettime"
 	timer_id = $timer_id
 	setting_uaddr = $setting
-	argstr = sprintf("%d, [0x%x]", timer_id, setting_uaddr)
+	argstr = sprintf("%d, [0x%p]", timer_id, setting_uaddr)
 }
 probe syscall.compat_timer_gettime.return =
 	kernel.function("compat_timer_gettime").return {
@@ -1529,7 +1529,7 @@ probe syscall.compat_clock_settime = kernel.function("compat_clock_settime") {
 	name = "compat_clock_settime"
 	which_clock = $which_clock
 	tp_uaddr = $tp
-	argstr = sprintf("%d, [0x%x]", which_clock, tp_uaddr)
+	argstr = sprintf("%d, [0x%p]", which_clock, tp_uaddr)
 }
 probe syscall.compat_clock_settime.return =
 	kernel.function("compat_clock_settime").return {
@@ -1545,7 +1545,7 @@ probe syscall.compat_clock_gettime = kernel.function("compat_clock_gettime") {
 	name = "compat_clock_gettime"
 	which_clock = $which_clock
 	tp_uaddr = $tp
-	argstr = sprintf("%d, [0x%x]", which_clock, tp_uaddr)
+	argstr = sprintf("%d, [0x%p]", which_clock, tp_uaddr)
 }
 probe syscall.compat_clock_gettime.return =
 	kernel.function("compat_clock_gettime").return {
@@ -1561,7 +1561,7 @@ probe syscall.compat_clock_getres = kernel.function("compat_clock_getres") {
 	name = "compat_clock_getres"
 	which_clock = $which_clock
 	tp_uaddr = $tp
-	argstr = sprintf("%d, [0x%x]", which_clock, tp_uaddr)
+	argstr = sprintf("%d, [0x%p]", which_clock, tp_uaddr)
 }
 probe syscall.compat_clock_getres.return =
 	kernel.function("compat_clock_getres").return {
@@ -1582,7 +1582,7 @@ probe syscall.compat_clock_nanosleep = kernel.function("compat_clock_nanosleep")
 	flag_str = "TIMER_ABSTIME"
 	rqtp_uaddr = $rqtp
 	rmtp_uaddr = $rmtp
-	argstr = sprintf("%s, %s, [0x%x], [0x%x]", clock_id_str,
+	argstr = sprintf("%s, %s, [0x%p], [0x%p]", clock_id_str,
 				flag_str, rqtp_uaddr, rmtp_uaddr)
 }
 probe syscall.compat_clock_nanosleep.return =
@@ -1606,7 +1606,7 @@ probe syscall.sys32_swapcontext = kernel.function("sys32_swapcontext") {
 	r7 = $r7
 	r8 = $r8
 	regs = $regs
-	argstr = sprintf("[0x%x], [0x%x], %d, %d, %d, %d, [0x%x]",
+	argstr = sprintf("[0x%p], [0x%p], %d, %d, %d, %d, [0x%p]",
 			old_ctx_uaddr, new_ctx_uaddr, r5, r6, r7, r8, regs)
 }
 probe syscall.sys32_swapcontext.return =
@@ -1624,7 +1624,7 @@ probe syscall.sys32_utimes = kernel.function("sys32_utimes") {
 	filename_uaddr = $filename
 	filename = user_string($filename)
 	tvp_uaddr = $tvs
-	argstr = sprintf("%s, [0x%x]", filename, tvp_uaddr)
+	argstr = sprintf("%s, [0x%p]", filename, tvp_uaddr)
 }
 probe syscall.sys32_utimes.return = kernel.function("sys32_utimes").return {
 	name = "sys32_utimes"
@@ -1641,7 +1641,7 @@ probe syscall.compat_statfs64 = kernel.function("compat_statfs64") {
 	path = user_string($path)
 	sz = $sz
 	buf_uaddr = $buf
-	argstr = sprintf("%s, %d, [0x%x]", path, sz, buf_uaddr)
+	argstr = sprintf("%s, %d, [0x%p]", path, sz, buf_uaddr)
 }
 probe syscall.compat_statfs64.return =
 	kernel.function("compat_statfs64").return {
@@ -1658,7 +1658,7 @@ probe syscall.compat_fstatfs64 = kernel.function("compat_fstatfs64") {
 	fd = $fd
 	sz = $sz
 	buf_uaddr = $buf
-	argstr = sprintf("%d, %d, [0x%x]", fd, sz, buf_uaddr)
+	argstr = sprintf("%d, %d, [0x%p]", fd, sz, buf_uaddr)
 }
 probe syscall.compat_fstatfs64.return =
 	kernel.function("compat_fstatfs64").return {
@@ -1679,7 +1679,7 @@ probe syscall.compat_mbind = kernel.function("compat_mbind") {
 	nodemask_uaddr = $nmask
 	maxnode = $maxnode
 	flags = $flags
-	argstr = sprintf("[0x%x], %d, %d, [0x%x], %d, %d", start_uaddr, len,
+	argstr = sprintf("[0x%p], %d, %d, [0x%p], %d, %d", start_uaddr, len,
 			policy, nodemask_uaddr, maxnode, flags)
 }
 probe syscall.compat_mbind.return = kernel.function("compat_mbind").return {
@@ -1700,7 +1700,7 @@ probe syscall.compat_get_mempolicy = kernel.function("compat_get_mempolicy") {
 	maxnode = $maxnode
 	addr = $addr
 	flags = $flags
-	argstr = sprintf("[0x%x], [0x%x], %d, %d", policy_uaddr, nmask_uaddr,
+	argstr = sprintf("[0x%p], [0x%p], %d, %d", policy_uaddr, nmask_uaddr,
 				maxnode, addr)
 }
 probe syscall.compat_get_mempolicy.return =
@@ -1718,7 +1718,7 @@ probe syscall.compat_set_mempolicy = kernel.function("compat_set_mempolicy") {
 	policy = $mode
 	nodemask_uaddr = $nmask
 	maxnode = $maxnode
-	argstr = sprintf("%d, [0x%x], %d", policy, nodemask_uaddr, maxnode)
+	argstr = sprintf("%d, [0x%p], %d", policy, nodemask_uaddr, maxnode)
 }
 probe syscall.compat_set_mempolicy.return =
 	kernel.function("compat_set_mempolicy").return {
@@ -1733,7 +1733,7 @@ probe syscall.ppc64_sys_stime = kernel.function("ppc64_sys_stime") {
 	name = "ppc64_sys_stime"
 	/* FIXME */
 	t_uaddr = $tptr
-	argstr = sprintf("[0x%x]", t_uaddr)
+	argstr = sprintf("[0x%p]", t_uaddr)
 }
 probe syscall.ppc64_sys_stime.return =
 	kernel.function("ppc64_sys_stime").return {
@@ -1747,7 +1747,7 @@ probe syscall.ppc64_sys_stime.return =
 probe syscall.ppc64_newuname = kernel.function("ppc64_newuname") {
 	name = "ppc64_newuname"
 	name_uaddr = $name
-	argstr = sprintf("[0x%x]", name_uaddr)
+	argstr = sprintf("[0x%p]", name_uaddr)
 }
 probe syscall.ppc64_newuname.return = kernel.function("ppc64_newuname").return {
 	name = "ppc64_newuname"
@@ -1768,7 +1768,7 @@ probe syscall.old32_readdir = kernel.function("old32_readdir") {
 	fd = $fd
 	dirp_uaddr = $dirent
 	count = $count
-	argstr = sprintf("%d, [0x%x], %d", fd, dirp_uaddr, count)
+	argstr = sprintf("%d, [0x%p], %d", fd, dirp_uaddr, count)
 }
 probe syscall.old32_readdir.return =
 	kernel.function("old32_readdir").return {
@@ -1783,7 +1783,7 @@ probe syscall.sys64_time = kernel.function("sys64_time") {
 	name = "sys64_time"
 	/* FIXME */
 	t_uaddr = $tloc
-	argstr = sprintf("[0x%x]", t_uaddr)
+	argstr = sprintf("[0x%p]", t_uaddr)
 }
 probe syscall.sys64_time.return = kernel.function("sys64_time").return {
 	name = "sys64_time"
@@ -1810,7 +1810,7 @@ probe syscall.ppc64_personality.return =
 probe syscall.ppc_rtas = kernel.function("ppc_rtas") {
 	name = "ppc_rtas"
 	uargs_uaddr = $uargs
-	argstr = sprintf("[0x%x]", uargs_uaddr)
+	argstr = sprintf("[0x%p]", uargs_uaddr)
 }
 probe syscall.ppc_rtas.return = kernel.function("ppc_rtas").return {
 	name = "ppc_rtas"