[Valgrind-developers] valgrind/coregrind [POSSIBLY UNSAFE]

[Nicholas N. <nj...@ca...>]

CVS commit by nethercote: 


64-bit cleanness tweaks.


  M +2 -1      stage1.c   1.29 [POSSIBLY UNSAFE: printf]
  M +1 -1      ume.c   1.35 [POSSIBLY UNSAFE: scanf]
  M +3 -3      vg_main.c   1.224 [POSSIBLY UNSAFE: printf]
  M +2 -2      vg_proxylwp.c   1.28


--- valgrind/coregrind/stage1.c  #1.28:1.29
@@ -116,5 +116,6 @@ static void *fix_auxv(void *v_init_esp, 
    for(; auxv->a_type != AT_NULL; auxv++) {
       if (0)
-         printf("doing auxv %p %4x: %d %p\n", auxv, auxv->a_type, auxv->u.a_val, auxv->u.a_ptr);
+         printf("doing auxv %p %4lld: %lld %p\n",
+                auxv, (ULong)auxv->a_type, (ULong)auxv->u.a_val, auxv->u.a_ptr);
 
       switch(auxv->a_type) {

--- valgrind/coregrind/ume.c  #1.34:1.35
@@ -101,5 +101,5 @@ void foreach_map(int (*fn)(char *start, 
       void *segstart, *segend;
 
-      sscanf(bufptr, "%p-%p %s %Lx %x:%x %d",
+      sscanf(bufptr, "%p-%p %s %llx %x:%x %d",
              &segstart, &segend, perm, &offset, &maj, &min, &ino);
       bufptr = strchr(bufptr, '\n');

--- valgrind/coregrind/vg_main.c  #1.223:1.224
@@ -881,5 +881,5 @@ static char *copy_str(char **tab, const 
 
    if (0)
-      printf("copied %p \"%s\" len %d\n", orig, orig, cp-orig);
+      printf("copied %p \"%s\" len %lld\n", orig, orig, (Long)(cp-orig));
 
    *tab = cp;
@@ -1129,5 +1129,5 @@ static Addr setup_client_stack(void* ini
          /* stomp out anything we don't know about */
          if (0)
-            printf("stomping auxv entry %d\n", auxv->a_type);
+            printf("stomping auxv entry %lld\n", (ULong)auxv->a_type);
          auxv->a_type = AT_IGNORE;
          break;
@@ -1285,5 +1285,5 @@ static void load_tool( const char *tooln
               VG_CORE_INTERFACE_MAJOR_VERSION, 
               VG_CORE_INTERFACE_MINOR_VERSION,
-              sizeof(*toolinfo),
+              (Int)sizeof(*toolinfo),
               toolinfo->interface_major_version,
               toolinfo->interface_minor_version, 

--- valgrind/coregrind/vg_proxylwp.c  #1.27:1.28
@@ -1020,7 +1020,7 @@ static void sys_wait_results(Bool block,
          case PX_RunSyscall:
             if (VG_(clo_trace_syscalls))
-               VG_(message)(Vg_DebugMsg, "sys_wait_results: got PX_RunSyscall for TID %d: syscall %d result %d",
+               VG_(message)(Vg_DebugMsg, "sys_wait_results: got PX_RunSyscall for TID %d: syscall %d result %lld",
                             res.tid, tst->syscallno,
-                            PLATFORM_SYSCALL_RET(tst->arch));
+                            (UWord)PLATFORM_SYSCALL_RET(tst->arch));
 
             if (tst->status != VgTs_WaitSys)