From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sender-0.a4lg.com (mail-sender-0.a4lg.com [IPv6:2401:2500:203:30b:4000:6bfe:4757:0]) by sourceware.org (Postfix) with ESMTPS id 36FBE3858280 for ; Sat, 13 Aug 2022 10:11:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 36FBE3858280 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id AF51130008A; Sat, 13 Aug 2022 10:11:28 +0000 (UTC) From: Tsukasa OI To: Tsukasa OI , "H . Peter Anvin" , Nelson Chu , Kito Cheng , Palmer Dabbelt Cc: binutils@sourceware.org Subject: [PATCH v6 3/4] RISC-V: Fix JALR target address computation Date: Sat, 13 Aug 2022 19:10:43 +0900 Message-Id: <82ed6d9a39a856c79f097e746f383c2dcb590e2f.1660385389.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2022 10:11:32 -0000 H. Peter Anvin discovered that we have wrong address computation for JALR instruction (the initial bug is back in 2018). This commit will fix that based on the idea of Palmer Dabbelt. opcodes/ChangeLog: * riscv-dis.c (print_insn_args): Fix JALR address computation. --- opcodes/riscv-dis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 419c4746db9..162a2971320 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -406,7 +406,7 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info case 'b': case 's': if ((l & MASK_JALR) == MATCH_JALR) - maybe_print_address (pd, rs1, 0, false); + maybe_print_address (pd, rs1, EXTRACT_ITYPE_IMM (l), false); print (info->stream, dis_style_register, "%s", riscv_gpr_names[rs1]); break; -- 2.34.1