64-bit cleanness tweaks.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2890

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index 81151d3e65ceb6a749fd60e463d79c6a485f4010..3f634da1922fbd22527406a8085cc7481723393d 100644 (file)
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -3345,8 +3345,8 @@ PRE(ioctl)
    case VKI_CDROMSUBCHNL:
       SYSCALL_TRACK( pre_mem_read,tid, 
                     "ioctl(CDROMSUBCHNL (cdsc_format, char))",
-                    (int) &(((struct vki_cdrom_subchnl *) arg3)->cdsc_format), 
-                    sizeof(((struct vki_cdrom_subchnl *) arg3)->cdsc_format));
+                    (Addr) &(((struct vki_cdrom_subchnl*) arg3)->cdsc_format),
+                    sizeof(((struct vki_cdrom_subchnl*) arg3)->cdsc_format));
       SYSCALL_TRACK( pre_mem_write,tid, 
                     "ioctl(CDROMSUBCHNL)", arg3, 
                     sizeof(struct vki_cdrom_subchnl));
@@ -3363,12 +3363,12 @@ PRE(ioctl)
    case VKI_CDROMREADTOCENTRY:
       SYSCALL_TRACK( pre_mem_read,tid, 
                     "ioctl(CDROMREADTOCENTRY (cdte_format, char))",
-                    (int) &(((struct vki_cdrom_tocentry *) arg3)->cdte_format), 
-                    sizeof(((struct vki_cdrom_tocentry *) arg3)->cdte_format));
+                    (Addr) &(((struct vki_cdrom_tocentry*) arg3)->cdte_format),
+                    sizeof(((struct vki_cdrom_tocentry*) arg3)->cdte_format));
       SYSCALL_TRACK( pre_mem_read,tid, 
                     "ioctl(CDROMREADTOCENTRY (cdte_track, char))",
-                    (int) &(((struct vki_cdrom_tocentry *) arg3)->cdte_track), 
-                    sizeof(((struct vki_cdrom_tocentry *) arg3)->cdte_track));
+                    (Addr) &(((struct vki_cdrom_tocentry*) arg3)->cdte_track), 
+                    sizeof(((struct vki_cdrom_tocentry*) arg3)->cdte_track));
       SYSCALL_TRACK( pre_mem_write,tid, 
                     "ioctl(CDROMREADTOCENTRY)", arg3, 
                     sizeof(struct vki_cdrom_tocentry));