Skip to content

Commit bc87076

Browse files
committed
Don't rely on definition of unratified bitmanip opcodes
See riscv/riscv-opcodes#401
1 parent 93b47a2 commit bc87076

File tree

13 files changed

+389
-333
lines changed

13 files changed

+389
-333
lines changed

disasm/disasm.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,8 +1132,8 @@ void disassembler_t::add_instructions(const isa_parser_t* isa, bool strict)
11321132
DEFINE_RTYPE(xnor);
11331133
DEFINE_R1TYPE(sext_b);
11341134
DEFINE_R1TYPE(sext_h);
1135-
add_insn(new disasm_insn_t("rev8", match_grevi | ((isa->get_max_xlen() - 8) << imm_shift), mask_grevi | mask_imm, {&xrd, &xrs1}));
1136-
add_insn(new disasm_insn_t("orc.b", match_gorci | (0x7 << imm_shift), mask_grevi | mask_imm, {&xrd, &xrs1}));
1135+
DEFINE_R1TYPE(rev8);
1136+
DEFINE_R1TYPE(orc_b);
11371137
add_insn(new disasm_insn_t("zext.h", (isa->get_max_xlen() == 32 ? match_pack : match_packw), mask_pack | mask_rs2, {&xrd, &xrs1}));
11381138
if (xlen_eq(64)) {
11391139
DEFINE_RTYPE(rorw);
@@ -1163,8 +1163,8 @@ void disassembler_t::add_instructions(const isa_parser_t* isa, bool strict)
11631163
}
11641164

11651165
if (ext_enabled(EXT_ZBKB)) {
1166-
add_insn(new disasm_insn_t("brev8", match_grevi | (0x7 << imm_shift), mask_grevi | mask_imm, {&xrd, &xrs1})); // brev8
1167-
add_insn(new disasm_insn_t("rev8", match_grevi | ((isa->get_max_xlen() - 8) << imm_shift), mask_grevi | mask_imm, {&xrd, &xrs1}));
1166+
DEFINE_R1TYPE(brev8);
1167+
DEFINE_R1TYPE(rev8);
11681168
DEFINE_RTYPE(pack);
11691169
DEFINE_RTYPE(packh);
11701170
if (xlen_eq(64)) {

0 commit comments

Comments
 (0)