diff options
| author | Palmer Dabbelt <palmer@dabbelt.com> | 2017-08-10 15:50:30 -0700 |
|---|---|---|
| committer | Andrew Waterman <aswaterman@gmail.com> | 2017-08-10 15:50:30 -0700 |
| commit | 7f746b7c2f27f6271640efaeb2cde86fd1b86957 (patch) | |
| tree | 85ae2ddd46ec55a058fd3a4a1dba5c81eaeae2df /spike_main | |
| parent | 96218b1cdc0cd395d150e7db08a1b84ea1ae1543 (diff) | |
| download | spike-7f746b7c2f27f6271640efaeb2cde86fd1b86957.zip spike-7f746b7c2f27f6271640efaeb2cde86fd1b86957.tar.gz spike-7f746b7c2f27f6271640efaeb2cde86fd1b86957.tar.bz2 | |
Correct c.li and c.lui disassembly (#118)
I currently get this disassembly
00004881 jr a7
but if I understand that's incorrect and I want
00004881 li a7, 0
If I'm reading the ISA manual correctly, the disassembler was just wrong
here.
Diffstat (limited to 'spike_main')
| -rw-r--r-- | spike_main/disasm.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spike_main/disasm.cc b/spike_main/disasm.cc index 56c6fe6..eedc6b8 100644 --- a/spike_main/disasm.cc +++ b/spike_main/disasm.cc @@ -500,8 +500,8 @@ disassembler_t::disassembler_t(int xlen) DISASM_INSN("ebreak", c_add, mask_rd | mask_rvc_rs2, {}); add_insn(new disasm_insn_t("ret", match_c_li | match_rd_ra, mask_c_li | mask_rd | mask_rvc_imm, {})); - DISASM_INSN("jr", c_li, mask_rvc_imm, {&rvc_rs1}); - DISASM_INSN("jalr", c_lui, mask_rvc_imm, {&rvc_rs1}); + DISASM_INSN("jr", c_jr, mask_rvc_imm, {&rvc_rs1}); + DISASM_INSN("jalr", c_jalr, mask_rvc_imm, {&rvc_rs1}); DISASM_INSN("nop", c_addi, mask_rd | mask_rvc_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}); |