More minor 64-bit cleanness tweaks.

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

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index 80013684b5f61d53b952e6c1e117041d389e1856..e4e98a6888bed6b156065d0f8ce4a2b11ddcc10c 100644 (file)
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -5882,7 +5882,7 @@ struct sys_info {
 static void bad_before(ThreadId tid, ThreadState *tst)
 {
    VG_(message)
-      (Vg_DebugMsg,"WARNING: unhandled syscall: %d", SYSNO);
+      (Vg_DebugMsg,"WARNING: unhandled syscall: %u", (UInt)SYSNO);
    if (VG_(clo_verbosity) > 1) {
       ExeContext *ec = VG_(get_ExeContext)(tid);
       VG_(pp_ExeContext)(ec);
@@ -6185,7 +6185,7 @@ Bool VG_(pre_syscall) ( ThreadId tid )
    if (SYSNO == __NR_vfork)
       SYSNO = __NR_fork;
 
-   syscallno = SYSNO;
+   syscallno = (UInt)SYSNO;
 
    if (tst->syscallno != -1)
       VG_(printf)("tid %d has syscall %d\n", tst->tid, tst->syscallno);
@@ -6253,7 +6253,7 @@ Bool VG_(pre_syscall) ( ThreadId tid )
    } else {
       (sys->before)(tst->tid, tst);
 
-      if ((Int)res <= 0) {
+      if ((Word)res <= 0) {
         /* "before" decided the syscall wasn't viable, so don't do
            anything - just pretend the syscall happened. */
         syscall_done = True;

diff --git a/coregrind/x86/core_arch.h b/coregrind/x86/core_arch.h
index b1a251547d11e8aad22d4f69befda033b39d57c5..f57003f8efb7fd3ff7f70f13778f600fb881eb0f 100644 (file)
--- a/coregrind/x86/core_arch.h
+++ b/coregrind/x86/core_arch.h
@@ -53,8 +53,8 @@
 
 // Stack frame layout and linkage
 #define FIRST_STACK_FRAME(ebp)         (ebp)
-#define STACK_FRAME_RET(ebp)           (((UInt*)ebp)[1])
-#define STACK_FRAME_NEXT(ebp)          (((UInt*)ebp)[0])
+#define STACK_FRAME_RET(ebp)           (((UWord*)ebp)[1])
+#define STACK_FRAME_NEXT(ebp)          (((UWord*)ebp)[0])
 
 // Offsets of interesting registers
 #define VGOFF_INSTR_PTR                VGOFF_(m_eip)