From 9a463fd912aadef7c87d49163ec38cc0e41a7530 Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Mon, 27 Nov 2023 09:52:06 +0100 Subject: [PATCH] coverity: a few more unsigned comparisons and unused return values --- VEX/priv/guest_arm64_toIR.c | 8 +++++--- coregrind/vgdb.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/VEX/priv/guest_arm64_toIR.c b/VEX/priv/guest_arm64_toIR.c index fcfeca70d8..9076a61a63 100644 --- a/VEX/priv/guest_arm64_toIR.c +++ b/VEX/priv/guest_arm64_toIR.c @@ -2385,7 +2385,7 @@ Bool dbm_DecodeBitMasks ( /*OUT*/ULong* wmask, /*OUT*/ULong* tmask, vassert(len >= 1 && len <= 6); ULong levels = // (zeroes(6 - len) << (6-len)) | ones(len); - (1U << len) - 1; + (1UL << len) - 1; vassert(levels >= 1 && levels <= 63); if (immediate && ((imms & levels) == levels)) { @@ -10431,7 +10431,9 @@ Bool dis_AdvSIMD_scalar_shift_by_imm(/*MB_OUT*/DisResult* dres, UInt insn) UInt shift = 0; Bool ok = getLaneInfo_IMMH_IMMB(&shift, &size, immh, immb); if (!ok || size == X11) return False; - vassert(size >= X00 && size <= X10); + // always true, size is unsigned int + //vassert(size >= X00); + vassert(size <= X10); vassert(shift >= 1 && shift <= (8 << size)); const HChar* nm = "??"; IROp op = Iop_INVALID; @@ -11836,7 +11838,7 @@ Bool dis_AdvSIMD_shift_by_immediate(/*MB_OUT*/DisResult* dres, UInt insn) Adjust shift to compensate. */ UInt lanebits = 8 << size; shift = lanebits - shift; - vassert(shift >= 0 && shift < lanebits); + vassert(shift < lanebits); IROp op = mkVecSHLN(size); IRExpr* src = getQReg128(nn); IRTemp res = newTempV128(); diff --git a/coregrind/vgdb.c b/coregrind/vgdb.c index e109048b1c..40292bab23 100644 --- a/coregrind/vgdb.c +++ b/coregrind/vgdb.c @@ -1254,7 +1254,7 @@ int fork_and_exec_valgrind (int argc, char **argv, const char *working_dir, /* close stdin */ close (0); /* open /dev/null as new stdin */ - open ("/dev/null", O_RDONLY); + (void)open ("/dev/null", O_RDONLY); /* redirect stdout as stderr */ dup2 (2, 1); } -- 2.47.2