diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-07-25 16:13:08 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2013-07-25 16:13:08 -0700 |
| commit | d237ebbd5c7a68443ec94c0127e98071b59399b0 (patch) | |
| tree | 32ea7f3183b96732671de2ffeaf075afbc8361ff /riscv/disasm.cc | |
| parent | 2c87b07a1d43d19acde6c7221bb60a52113e1ea6 (diff) | |
| download | riscv-isa-sim-d237ebbd5c7a68443ec94c0127e98071b59399b0.zip riscv-isa-sim-d237ebbd5c7a68443ec94c0127e98071b59399b0.tar.gz riscv-isa-sim-d237ebbd5c7a68443ec94c0127e98071b59399b0.tar.bz2 | |
Remove JALR static hints
Diffstat (limited to 'riscv/disasm.cc')
| -rw-r--r-- | riscv/disasm.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/riscv/disasm.cc b/riscv/disasm.cc index 27af927..ca3b3dd 100644 --- a/riscv/disasm.cc +++ b/riscv/disasm.cc @@ -504,12 +504,10 @@ disassembler::disassembler() DEFINE_LTYPE(lui); DEFINE_LTYPE(auipc); - DEFINE_I2TYPE("jr", jalr_j); - add_insn(new disasm_insn_t("jalr", match_jalr_c | match_rd_ra, mask_jalr_c | mask_rd | mask_imm, xrs1_reg)); - add_insn(new disasm_insn_t("ret", match_jalr_r | match_rs1_ra, mask_jalr_r | mask_rd | mask_rs1 | mask_imm)); - DEFINE_ITYPE(jalr_c); - DEFINE_ITYPE(jalr_r); - DEFINE_ITYPE(jalr_j); + DEFINE_I2TYPE("jr", jalr); + add_insn(new disasm_insn_t("jalr", match_jalr | match_rd_ra, mask_jalr | mask_rd | mask_imm, xrs1_reg)); + add_insn(new disasm_insn_t("ret", match_jalr | match_rs1_ra, mask_jalr | mask_rd | mask_rs1 | mask_imm)); + DEFINE_ITYPE(jalr); add_insn(new disasm_insn_t("nop", match_addi, mask_addi | mask_rd | mask_rs1 | mask_imm)); DEFINE_I0TYPE("li", addi); @@ -572,7 +570,6 @@ disassembler::disassembler() add_insn(new disasm_insn_t("setpcr", match_setpcr, mask_setpcr, xrd_reg, pcr_reg, imm)); add_insn(new disasm_insn_t("clearpcr", match_clearpcr, mask_clearpcr, xrd_reg, pcr_reg, imm)); DEFINE_NOARG(eret) - DEFINE_NOARG(cflush) DEFINE_RS1(vxcptsave); DEFINE_RS1(vxcptrestore); |