From 03b039a518fa0f89a9900a44a8b874cc91061305 Mon Sep 17 00:00:00 2001 From: Kito Cheng Date: Tue, 7 Mar 2017 19:56:40 +0800 Subject: [PATCH] RISC-V: Fix assembler for c.addi, rd can be x0 opcodes/ChangeLog: 2017-03-14 Kito Cheng * riscv-opc.c (riscv_opcodes) : Use match_opcode. --- opcodes/ChangeLog | 4 ++++ opcodes/riscv-opc.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 622ccf4..d473074 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2017-03-14 Kito Cheng + + * riscv-opc.c (riscv_opcodes) : Use match_opcode. + 2017-03-13 Andrew Waterman * riscv-opc.c (riscv_opcodes) : Use match_opcode. diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 1bb90ee..4a2ab7b 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -625,7 +625,7 @@ const struct riscv_opcode riscv_opcodes[] = {"c.li", "C", "d,Cj", MATCH_C_LI, MASK_C_LI, match_rd_nonzero, 0 }, {"c.addi4spn","C", "Ct,Cc,CK", MATCH_C_ADDI4SPN, MASK_C_ADDI4SPN, match_opcode, 0 }, {"c.addi16sp","C", "Cc,CL", MATCH_C_ADDI16SP, MASK_C_ADDI16SP, match_opcode, 0 }, -{"c.addi", "C", "d,Cj", MATCH_C_ADDI, MASK_C_ADDI, match_rd_nonzero, 0 }, +{"c.addi", "C", "d,Cj", MATCH_C_ADDI, MASK_C_ADDI, match_opcode, 0 }, {"c.add", "C", "d,CV", MATCH_C_ADD, MASK_C_ADD, match_c_add, 0 }, {"c.sub", "C", "Cs,Ct", MATCH_C_SUB, MASK_C_SUB, match_opcode, 0 }, {"c.and", "C", "Cs,Ct", MATCH_C_AND, MASK_C_AND, match_opcode, 0 }, -- 2.7.4