diff options
Diffstat (limited to 'disasm')
| -rw-r--r-- | disasm/disasm.cc | 5 | ||||
| -rw-r--r-- | disasm/isa_parser.cc | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/disasm/disasm.cc b/disasm/disasm.cc index 7c07ec3..5c0e9e0 100644 --- a/disasm/disasm.cc +++ b/disasm/disasm.cc @@ -1391,11 +1391,14 @@ void disassembler_t::add_instructions(const isa_parser_t* isa) if (isa->get_max_xlen() == 32) { DISASM_INSN("c.jal", c_jal, 0, {&rvc_jump_target}); } else { + DISASM_INSN("c.addiw", c_addiw, 0, {&xrd, &rvc_imm}); + } + + if (isa->get_max_xlen() == 64 || isa->extension_enabled(EXT_ZCMLSD)) { DISASM_INSN("c.ld", c_ld, 0, {&rvc_rs2s, &rvc_ld_address}); DISASM_INSN("c.ldsp", c_ldsp, 0, {&xrd, &rvc_ldsp_address}); DISASM_INSN("c.sd", c_sd, 0, {&rvc_rs2s, &rvc_ld_address}); DISASM_INSN("c.sdsp", c_sdsp, 0, {&rvc_rs2, &rvc_sdsp_address}); - DISASM_INSN("c.addiw", c_addiw, 0, {&xrd, &rvc_imm}); } } diff --git a/disasm/isa_parser.cc b/disasm/isa_parser.cc index ee57a51..7d3d002 100644 --- a/disasm/isa_parser.cc +++ b/disasm/isa_parser.cc @@ -239,6 +239,12 @@ isa_parser_t::isa_parser_t(const char* str, const char *priv) extension_table[EXT_ZICOND] = true; } else if (ext_str == "zihpm") { extension_table[EXT_ZIHPM] = true; + } else if (ext_str == "zilsd") { + if (max_xlen != 32) + bad_isa_string(str, "'Zilsd' requires RV32"); + extension_table[EXT_ZILSD] = true; + } else if (ext_str == "zcmlsd") { + extension_table[EXT_ZCMLSD] = true; } else if (ext_str == "zvbb") { extension_table[EXT_ZVBB] = true; } else if (ext_str == "zvbc") { @@ -324,6 +330,14 @@ isa_parser_t::isa_parser_t(const char* str, const char *priv) bad_isa_string(str, ("can't parse: " + std::string(p)).c_str()); } + if (extension_table[EXT_ZCMLSD] && extension_table[EXT_ZCF]) { + bad_isa_string(str, "'Zcmlsd' extension conflicts with 'Zcf' extensions"); + } + + if (extension_table[EXT_ZCMLSD] && (!extension_table[EXT_ZCA] || !extension_table[EXT_ZILSD])) { + bad_isa_string(str, "'Zcmlsd' extension requires 'Zca' and 'Zilsd' extensions"); + } + if (extension_table[EXT_ZFBFMIN] && !extension_table['F']) { bad_isa_string(str, "'Zfbfmin' extension requires 'F' extension"); } |