diff options
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/riscv/c-zero-imm.d | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/riscv/c-zero-imm.s | 1 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 5 | ||||
| -rw-r--r-- | opcodes/riscv-opc.c | 8 |
5 files changed, 22 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 63fa139..1c128ee 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2018-01-15 Jim Wilson <jimw@sifive.com> + + * testsuite/gas/riscv/c-zero-imm.s: Test addi that compresses to c.nop. + * testsuite/gas/riscv/c-zero-imm.d: Likewise. + 2018-01-15 Thomas Preud'homme <thomas.preudhomme@arm.com> * config/tc-arm.c (ToC): Define macro. diff --git a/gas/testsuite/gas/riscv/c-zero-imm.d b/gas/testsuite/gas/riscv/c-zero-imm.d index ac47e80..c138966 100644 --- a/gas/testsuite/gas/riscv/c-zero-imm.d +++ b/gas/testsuite/gas/riscv/c-zero-imm.d @@ -11,6 +11,7 @@ Disassembly of section .text: [ ]+2:[ ]+4581[ ]+li[ ]+a1,0 [ ]+4:[ ]+8a01[ ]+andi[ ]+a2,a2,0 [ ]+6:[ ]+8a81[ ]+andi[ ]+a3,a3,0 -[ ]+8:[ ]+00070713[ ]+mv[ ]+a4,a4 -[ ]+c:[ ]+0781[ ]+addi[ ]+a5,a5,0 +[ ]+8:[ ]+0001[ ]+nop +[ ]+a:[ ]+00070713[ ]+mv[ ]+a4,a4 +[ ]+e:[ ]+0781[ ]+addi[ ]+a5,a5,0 #... diff --git a/gas/testsuite/gas/riscv/c-zero-imm.s b/gas/testsuite/gas/riscv/c-zero-imm.s index 650313d..a07baa4 100644 --- a/gas/testsuite/gas/riscv/c-zero-imm.s +++ b/gas/testsuite/gas/riscv/c-zero-imm.s @@ -4,6 +4,7 @@ c.li a1,0 andi a2,a2,0 c.andi a3,0 + addi x0,x0,0 # Don't let this compress to a hint. addi a4,a4,0 # These are hints. diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index d889c45..422d09b 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2018-01-15 Jim Wilson <jimw@sifive.com> + + * riscv-opc.c (match_c_nop): New. + (riscv_opcodes) <addi>: Handle an addi that compresses to c.nop. + 2018-01-15 Nick Clifton <nickc@redhat.com> * po/uk.po: Updated Ukranian translation. diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 79e7214..a4e4b26 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -123,6 +123,13 @@ match_c_add_with_hint (const struct riscv_opcode *op, insn_t insn) } static int +match_c_nop (const struct riscv_opcode *op, insn_t insn) +{ + return (match_opcode (op, insn) + && (((insn & MASK_RD) >> OP_SH_RD) == 0)); +} + +static int match_c_addi16sp (const struct riscv_opcode *op, insn_t insn) { return (match_opcode (op, insn) @@ -225,6 +232,7 @@ const struct riscv_opcode riscv_opcodes[] = {"bne", "I", "s,t,p", MATCH_BNE, MASK_BNE, match_opcode, 0 }, {"addi", "C", "Ct,Cc,CK", MATCH_C_ADDI4SPN, MASK_C_ADDI4SPN, match_c_addi4spn, INSN_ALIAS }, {"addi", "C", "d,CU,Cj", MATCH_C_ADDI, MASK_C_ADDI, match_rd_nonzero, INSN_ALIAS }, +{"addi", "C", "d,CU,0", MATCH_C_NOP, MASK_C_ADDI | MASK_RVC_IMM, match_c_nop, INSN_ALIAS }, {"addi", "C", "Cc,Cc,CL", MATCH_C_ADDI16SP, MASK_C_ADDI16SP, match_c_addi16sp, INSN_ALIAS }, {"addi", "I", "d,s,j", MATCH_ADDI, MASK_ADDI, match_opcode, 0 }, {"add", "C", "d,CU,CV", MATCH_C_ADD, MASK_C_ADD, match_c_add, INSN_ALIAS }, |