Merge pull request #1811 from riscv-software-src/fix-1810

Validate Zvl ISA string correctly
riscv-software-src · Sep 20, 2024 · 19fdd76 · 19fdd76
2 parents 52aff02 + 6b74bd6
commit 19fdd76
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/disasm/isa_parser.cc b/disasm/isa_parser.cc
@@ -331,7 +331,7 @@ isa_parser_t::isa_parser_t(const char* str, const char *priv)
       } catch (std::logic_error& e) {
         new_vlen = 0;
       }
-      if ((new_vlen & (new_vlen - 1)) != 0 || new_vlen < 32)
+      if ((new_vlen & (new_vlen - 1)) != 0 || new_vlen < 32 || ext_str.back() != 'b')
         bad_isa_string(str, ("Invalid Zvl string: " + ext_str).c_str());
       vlen = std::max(vlen, new_vlen);
     } else if (ext_str.substr(0, 3) == "zve") {