Bug 503677 - duplicated-cond compiler warning in dis_RV64M

diff --git a/NEWS b/NEWS
index 71c389c53507f99cdcc2374df46259d6b4aac9e6..b69dc84f8bb6e5b9d9d31e62e46b4520f109a3f3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ than mailing the developers (or mailing lists) directly -- bugs that
 are not entered into bugzilla tend to get forgotten about or ignored.
 
 503641  close_range syscalls started failing with 3.25.0
+503677  duplicated-cond compiler warning in dis_RV64M
 
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX

diff --git a/VEX/priv/guest_riscv64_toIR.c b/VEX/priv/guest_riscv64_toIR.c
index 5d9b903c9b7fd3bc010fa3f0dff3e55e76ecf72d..393a7ca7d0546d3802ba0917e9ca964cae9c2470 100644 (file)
--- a/VEX/priv/guest_riscv64_toIR.c
+++ b/VEX/priv/guest_riscv64_toIR.c
@@ -1754,8 +1754,6 @@ static Bool dis_RV64M(/*MB_OUT*/ DisResult* dres,
       UInt rs1    = INSN(19, 15);
       UInt rs2    = INSN(24, 20);
       if (funct3 == 0b010) {
-         /* Invalid {MUL,DIV,REM}<x>, fall through. */
-      } else if (funct3 == 0b010) {
          /* MULHSU, not currently handled, fall through. */
       } else {
          if (rd != 0) {