mips: get rid of format and implicit-fallthrough warnings

Indicate when the fall through from the previous case label is intentional.
Fix format warnings related to arguments in printf calls.

diff --git a/VEX/priv/guest_mips_helpers.c b/VEX/priv/guest_mips_helpers.c
index af047ad9c14205d8a10f29c7a2c785f6197c0c12..603e37cba1caadb8638dc2298f1ef2f0f8ef62cc 100644 (file)
--- a/VEX/priv/guest_mips_helpers.c
+++ b/VEX/priv/guest_mips_helpers.c
@@ -1118,6 +1118,7 @@ extern UInt mips_dirtyhelper_calculate_MSACSR ( void* gs, UInt ws, UInt wt,
 
       case FSULTD:
          ASM_VOLATILE_MSA_BINARY(fsult.d);
+         break;
 
       case FMAXW:
          ASM_VOLATILE_MSA_BINARY(fmax.w);
@@ -1173,6 +1174,7 @@ extern UInt mips_dirtyhelper_calculate_MSACSR ( void* gs, UInt ws, UInt wt,
 
       case FRINTD:
          ASM_VOLATILE_MSA_UNARY(frint.d);
+         break;
 
       case FTRUNCUW:
          ASM_VOLATILE_MSA_UNARY(ftrunc_u.w);

diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index 69425a3acae0139c293855950ebae1df917d2bbc..c1fd4c23dee3049e599975737e42d0918f4874ff 100644 (file)
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -757,9 +757,11 @@ static Bool VG_(parse_cpuinfo)(void)
           case VEX_PRID_COMP_CAVIUM:
           case VEX_PRID_COMP_NETLOGIC:
              vai.hwcaps |= (VEX_MIPS_CPU_ISA_M64R2 | VEX_MIPS_CPU_ISA_M64R1);
+             /* fallthrough */
           case VEX_PRID_COMP_INGENIC_E1:
           case VEX_PRID_COMP_MIPS:
              vai.hwcaps |= VEX_MIPS_CPU_ISA_M32R2;
+             /* fallthrough */
           case VEX_PRID_COMP_BROADCOM:
              vai.hwcaps |= VEX_MIPS_CPU_ISA_M32R1;
              break;

diff --git a/coregrind/m_stacktrace.c b/coregrind/m_stacktrace.c
index 24f1409ddb819ea8258bf57b5c31c6c49e66ffe0..bc376eb473f0965b7b18059283cf83399ff38480 100644 (file)
--- a/coregrind/m_stacktrace.c
+++ b/coregrind/m_stacktrace.c
@@ -1426,7 +1426,7 @@ UInt VG_(get_StackTrace_wrk) ( ThreadId tid_if_known,
             }
          }
          if(debug)
-            VG_(printf)("offset: 0x%lx\n", frame_offset);
+            VG_(printf)("offset: 0x%ld\n", frame_offset);
       }
       if (seen_sp_adjust) {
          if (0 == uregs.pc || 1 == uregs.pc) break;

diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c
index 89cf126a7ba5e614634f1299f988727c2a09826c..00d3c78bd15d51468ff8ab388aebf5755d1ee3de 100644 (file)
--- a/coregrind/m_syswrap/syswrap-mips32-linux.c
+++ b/coregrind/m_syswrap/syswrap-mips32-linux.c
@@ -419,7 +419,7 @@ PRE(sys_mmap2)
      units rather than bytes, so that it can be used for files bigger than
      2^32 bytes. */
   SysRes r;
-  PRINT("sys_mmap2 ( %#lx, %lu, %lu, %lu, %lu, %lu )",
+  PRINT("sys_mmap2 ( %#lx, %lu, %ld, %ld, %ld, %ld )",
         ARG1, ARG2, SARG3, SARG4, SARG5, SARG6);
   PRE_REG_READ6(long, "mmap2", unsigned long, start, unsigned long, length,
                 unsigned long, prot, unsigned long, flags,
@@ -564,7 +564,7 @@ POST(sys_fstatat64)
 
 PRE(sys_fstat64)
 {
-  PRINT ("sys_fstat64 ( %lu, %#lx )", SARG1, ARG2);
+  PRINT ("sys_fstat64 ( %ld, %#lx )", SARG1, ARG2);
   PRE_REG_READ2 (long, "fstat64", unsigned long, fd, struct stat64 *, buf);
   PRE_MEM_WRITE ("fstat64(buf)", ARG2, sizeof (struct vki_stat64));
 }

diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c
index 026a470f10090cd2a60fb0a062d544088e2ec968..bc99b4a48f4a236bf190f6b45a2bfd51b36fa3cd 100644 (file)
--- a/coregrind/m_syswrap/syswrap-mips64-linux.c
+++ b/coregrind/m_syswrap/syswrap-mips64-linux.c
@@ -317,7 +317,7 @@ PRE(sys_cacheflush)
 
 PRE(sys_reboot)
 {
-   PRINT("sys_reboot ( %ld, %" FMT_REGWORD "d, %" FMT_REGWORD "u, %#"
+   PRINT("sys_reboot ( %ld, %" FMT_REGWORD "u, %" FMT_REGWORD "u, %#"
          FMT_REGWORD "x )", SARG1, ARG2, ARG3, ARG4);
    // An approximation. ARG4 is only read conditionally by the kernel
    PRE_REG_READ4(int, "reboot",