#include <sstream>
#include <stdlib.h>
-
struct : public arg_t {
std::string to_string(insn_t insn) const {
return std::to_string((int)insn.i_imm()) + '(' + xpr_name[insn.rs1()] + ')';
struct : public arg_t {
std::string to_string(insn_t insn) const {
- return std::string("0(") + xpr_name[insn.rs1()] + ')';
+ return std::string("(") + xpr_name[insn.rs1()] + ')';
}
} amo_address;
DEFINE_RTYPE(remw);
DEFINE_RTYPE(remuw);
- DEFINE_NOARG(scall);
- DEFINE_NOARG(sbreak);
+ DEFINE_NOARG(ecall);
+ DEFINE_NOARG(ebreak);
+ DEFINE_NOARG(uret);
+ DEFINE_NOARG(sret);
+ DEFINE_NOARG(hret);
+ DEFINE_NOARG(mret);
DEFINE_NOARG(fence);
DEFINE_NOARG(fence_i);
add_insn(new disasm_insn_t("csrrwi", match_csrrwi, mask_csrrwi, {&xrd, &csr, &zimm5}));
add_insn(new disasm_insn_t("csrrsi", match_csrrsi, mask_csrrsi, {&xrd, &csr, &zimm5}));
add_insn(new disasm_insn_t("csrrci", match_csrrci, mask_csrrci, {&xrd, &csr, &zimm5}));
- DEFINE_NOARG(sret)
DEFINE_FRTYPE(fadd_s);
DEFINE_FRTYPE(fsub_s);
DISASM_INSN("jr", c_li, mask_rvc_imm, {&rvc_rs1});
DISASM_INSN("jalr", c_lui, mask_rvc_imm, {&rvc_rs1});
DISASM_INSN("nop", c_addi, mask_rd | mask_rvc_imm, {});
- DISASM_INSN("addi", c_addi, mask_rd, {&rvc_sp, &rvc_sp, &rvc_addi16sp_imm});
+ DISASM_INSN("addi", c_addi16sp, mask_rd, {&rvc_sp, &rvc_sp, &rvc_addi16sp_imm});
DISASM_INSN("addi", c_addi4spn, 0, {&rvc_rs1s, &rvc_sp, &rvc_addi4spn_imm});
DISASM_INSN("li", c_li, 0, {&xrd, &rvc_imm});
DISASM_INSN("lui", c_lui, 0, {&xrd, &rvc_uimm});
DISASM_INSN("addi", c_addi, 0, {&xrd, &xrd, &rvc_imm});
DISASM_INSN("addiw", c_addiw, 0, {&xrd, &xrd, &rvc_imm});
DISASM_INSN("slli", c_slli, 0, {&xrd, &rvc_shamt});
- DISASM_INSN("mv", c_mv, 0, {&xrd, &rvc_rs1});
- DISASM_INSN("add", c_add, 0, {&xrd, &xrd, &rvc_rs1});
- DISASM_INSN("addw", c_addw, 0, {&xrd, &xrd, &rvc_rs1});
+ DISASM_INSN("mv", c_mv, 0, {&xrd, &rvc_rs2});
+ DISASM_INSN("add", c_add, 0, {&xrd, &xrd, &rvc_rs2});
+ DISASM_INSN("addw", c_addw, 0, {&rvc_rs1s, &rvc_rs1s, &rvc_rs2s});
+ DISASM_INSN("sub", c_sub, 0, {&rvc_rs1s, &rvc_rs1s, &rvc_rs2s});
+ DISASM_INSN("subw", c_subw, 0, {&rvc_rs1s, &rvc_rs1s, &rvc_rs2s});
+ DISASM_INSN("and", c_and, 0, {&rvc_rs1s, &rvc_rs1s, &rvc_rs2s});
+ DISASM_INSN("or", c_or, 0, {&rvc_rs1s, &rvc_rs1s, &rvc_rs2s});
+ DISASM_INSN("xor", c_xor, 0, {&rvc_rs1s, &rvc_rs1s, &rvc_rs2s});
DISASM_INSN("lw", c_lwsp, 0, {&xrd, &rvc_lwsp_address});
DISASM_INSN("flw", c_flwsp, 0, {&xrd, &rvc_lwsp_address});
DISASM_INSN("sw", c_swsp, 0, {&rvc_rs2, &rvc_swsp_address});