diff options
| author | Andrew Waterman <andrew@sifive.com> | 2016-12-18 22:53:52 -0800 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2016-12-20 12:26:34 +1030 |
| commit | 755c5297bdbca564e97040ce7f036ed02dc7fa4a (patch) | |
| tree | 1017211f4410afc70a0af19b6d4805cd9051b1e3 /opcodes | |
| parent | d115ab8eee9bb3e13aae86698a4fd91e0ed284e9 (diff) | |
| download | fsf-binutils-gdb-755c5297bdbca564e97040ce7f036ed02dc7fa4a.zip fsf-binutils-gdb-755c5297bdbca564e97040ce7f036ed02dc7fa4a.tar.gz fsf-binutils-gdb-755c5297bdbca564e97040ce7f036ed02dc7fa4a.tar.bz2 | |
Add canonical JALR for RISC-V
jalr rd,offset(rs1)
rather than
jalr rd,rs1,offset
This matches the format of other instructions.
* riscv-opc.c (riscv_opcodes): Change jr and jalr to "o(s)"
format.
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 5 | ||||
| -rw-r--r-- | opcodes/riscv-opc.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 92d2516..452422d 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,10 @@ 2016-12-20 Andrew Waterman <andrew@sifive.com> + * riscv-opc.c (riscv_opcodes): Change jr and jalr to "o(s)" + format. + +2016-12-20 Andrew Waterman <andrew@sifive.com> + * riscv-dis.c (riscv_disassemble_insn): Default to the ELF's XLEN when none is provided. diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 256e089..69fca09 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -132,11 +132,14 @@ const struct riscv_opcode riscv_opcodes[] = {"ret", "I", "", MATCH_JALR | (X_RA << OP_SH_RS1), MASK_JALR | MASK_RD | MASK_RS1 | MASK_IMM, match_opcode, INSN_ALIAS }, {"jr", "C", "d", MATCH_C_JR, MASK_C_JR, match_rd_nonzero, INSN_ALIAS }, {"jr", "I", "s", MATCH_JALR, MASK_JALR | MASK_RD | MASK_IMM, match_opcode, INSN_ALIAS }, +{"jr", "I", "o(s)", MATCH_JALR, MASK_JALR | MASK_RD, match_opcode, INSN_ALIAS }, {"jr", "I", "s,j", MATCH_JALR, MASK_JALR | MASK_RD, match_opcode, INSN_ALIAS }, {"jalr", "C", "d", MATCH_C_JALR, MASK_C_JALR, match_rd_nonzero, INSN_ALIAS }, {"jalr", "I", "s", MATCH_JALR | (X_RA << OP_SH_RD), MASK_JALR | MASK_RD | MASK_IMM, match_opcode, INSN_ALIAS }, +{"jalr", "I", "o(s)", MATCH_JALR | (X_RA << OP_SH_RD), MASK_JALR | MASK_RD, match_opcode, INSN_ALIAS }, {"jalr", "I", "s,j", MATCH_JALR | (X_RA << OP_SH_RD), MASK_JALR | MASK_RD, match_opcode, INSN_ALIAS }, {"jalr", "I", "d,s", MATCH_JALR, MASK_JALR | MASK_IMM, match_opcode, INSN_ALIAS }, +{"jalr", "I", "d,o(s)", MATCH_JALR, MASK_JALR, match_opcode, 0 }, {"jalr", "I", "d,s,j", MATCH_JALR, MASK_JALR, match_opcode, 0 }, {"j", "C", "Ca", MATCH_C_J, MASK_C_J, match_opcode, INSN_ALIAS }, {"j", "I", "a", MATCH_JAL, MASK_JAL | MASK_RD, match_opcode, INSN_ALIAS }, |