[Valgrind-developers] Valgrind: r15508 - in /trunk/coregrind: m_machine.c m_stacktrace.c

[<sv...@va...>]

Author: florian
Date: Sat Aug  8 22:08:31 2015
New Revision: 15508

Log:
Fix two more format inconsistencies found on s390. The one
in m_stacktrace.c also existed for other architectures. Fixed
as well.

Modified:
    trunk/coregrind/m_machine.c
    trunk/coregrind/m_stacktrace.c

Modified: trunk/coregrind/m_machine.c
==============================================================================
--- trunk/coregrind/m_machine.c (original)
+++ trunk/coregrind/m_machine.c Sat Aug  8 22:08:31 2015
@@ -1411,7 +1411,7 @@
      HChar *p = fac_str;
      p += VG_(sprintf)(p, "machine %4d  ", model);
      for (i=0; i < sizeof fac_hwcaps / sizeof fac_hwcaps[0]; ++i) {
-        p += VG_(sprintf)(p, " %s %1d", fac_hwcaps[i].name,
+        p += VG_(sprintf)(p, " %s %1u", fac_hwcaps[i].name,
                           fac_hwcaps[i].installed);
      }
      *p++ = '\0';

Modified: trunk/coregrind/m_stacktrace.c
==============================================================================
--- trunk/coregrind/m_stacktrace.c (original)
+++ trunk/coregrind/m_stacktrace.c Sat Aug  8 22:08:31 2015
@@ -730,7 +730,7 @@
       fp_max -= sizeof(Addr);
 
    if (debug)
-      VG_(printf)("max_n_ips=%d fp_min=0x%lx fp_max_orig=0x%lx, "
+      VG_(printf)("max_n_ips=%u fp_min=0x%lx fp_max_orig=0x%lx, "
                   "fp_max=0x%lx ip=0x%lx fp=0x%lx\n",
 		  max_n_ips, fp_min, fp_max_orig, fp_max, ip, fp);
 
@@ -995,7 +995,7 @@
       fp_max -= sizeof(Addr);
 
    if (debug)
-      VG_(printf)("\nmax_n_ips=%d fp_min=0x%lx fp_max_orig=0x%lx, "
+      VG_(printf)("\nmax_n_ips=%u fp_min=0x%lx fp_max_orig=0x%lx, "
                   "fp_max=0x%lx r15=0x%lx r13=0x%lx\n",
                   max_n_ips, fp_min, fp_max_orig, fp_max,
                   uregs.r15, uregs.r13);
@@ -1139,7 +1139,7 @@
       fp_max -= sizeof(Addr);
 
    if (debug)
-      VG_(printf)("\nmax_n_ips=%d fp_min=0x%lx fp_max_orig=0x%lx, "
+      VG_(printf)("\nmax_n_ips=%u fp_min=0x%lx fp_max_orig=0x%lx, "
                   "fp_max=0x%lx PC=0x%lx SP=0x%lx\n",
                   max_n_ips, fp_min, fp_max_orig, fp_max,
                   uregs.pc, uregs.sp);
@@ -1228,7 +1228,7 @@
       fp_max -= sizeof(Addr);
 
    if (debug)
-      VG_(printf)("max_n_ips=%d fp_min=0x%lx fp_max_orig=0x%lx, "
+      VG_(printf)("max_n_ips=%u fp_min=0x%lx fp_max_orig=0x%lx, "
                   "fp_max=0x%lx IA=0x%lx SP=0x%lx FP=0x%lx\n",
                   max_n_ips, fp_min, fp_max_orig, fp_max,
                   uregs.ia, uregs.sp,uregs.fp);
@@ -1321,7 +1321,7 @@
       fp_max -= sizeof(Addr);
 
    if (debug)
-      VG_(printf)("max_n_ips=%d fp_min=0x%lx fp_max_orig=0x%lx, "
+      VG_(printf)("max_n_ips=%u fp_min=0x%lx fp_max_orig=0x%lx, "
                   "fp_max=0x%lx pc=0x%lx sp=0x%lx fp=0x%lx\n",
                   max_n_ips, fp_min, fp_max_orig, fp_max,
                   uregs.pc, uregs.sp, uregs.fp);
@@ -1467,7 +1467,7 @@
       fp_max -= sizeof(Addr);
 
    if (debug)
-      VG_(printf)("max_n_ips=%d fp_min=0x%lx fp_max_orig=0x%lx, "
+      VG_(printf)("max_n_ips=%u fp_min=0x%lx fp_max_orig=0x%lx, "
                   "fp_max=0x%lx pc=0x%lx sp=0x%lx fp=0x%lx\n",
                   max_n_ips, fp_min, fp_max_orig, fp_max,
                   uregs.pc, uregs.sp, uregs.fp);