From dc950d964badcbc3f6ac0b8e49f138e7f9f85ab2 Mon Sep 17 00:00:00 2001 From: Petar Jovanovic Date: Thu, 28 Mar 2019 18:33:31 +0100 Subject: [PATCH] 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. --- VEX/priv/guest_mips_helpers.c | 2 ++ coregrind/m_machine.c | 2 ++ coregrind/m_stacktrace.c | 2 +- coregrind/m_syswrap/syswrap-mips32-linux.c | 4 ++-- coregrind/m_syswrap/syswrap-mips64-linux.c | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/VEX/priv/guest_mips_helpers.c b/VEX/priv/guest_mips_helpers.c index af047ad9c1..603e37cba1 100644 --- 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 69425a3aca..c1fd4c23de 100644 --- 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 24f1409ddb..bc376eb473 100644 --- 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 89cf126a7b..00d3c78bd1 100644 --- 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 026a470f10..bc99b4a48f 100644 --- 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", -- 2.47.2