From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id DAC993857B87 for ; Fri, 29 Jul 2022 13:11:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DAC993857B87 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 2543130008A; Fri, 29 Jul 2022 13:11:06 +0000 (UTC) From: Tsukasa OI To: Tsukasa OI , "H . Peter Anvin" , Nelson Chu , Kito Cheng , Palmer Dabbelt Cc: binutils@sourceware.org Subject: [PATCH 1/3] RISC-V: Print highest address on disassembler Date: Fri, 29 Jul 2022 22:10:34 +0900 Message-Id: <6980714d21a94a73a45ed542ac58ce4eac611691.1659100228.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 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: Fri, 29 Jul 2022 13:11:10 -0000 This patch makes possible to print the highest address (0xffffffff on RV32, 0xffffffff_ffffffff on RV64). This is particularly useful if the highest address space is used for I/O registers and corresponding symbols are defined. opcodes/ChangeLog: * riscv-dis.c (struct riscv_private_data): Add `to_print_addr' to enable printing the highest address. (maybe_print_address): Utilize `to_print_addr'. (riscv_disassemble_insn): Likewise. --- opcodes/riscv-dis.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 164fd209dbd..31a7e0975d2 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -52,6 +52,7 @@ struct riscv_private_data bfd_vma gp; bfd_vma print_addr; bfd_vma hi_addr[OP_MASK_RD + 1]; + bool to_print_addr; }; /* Used for mapping symbols. */ @@ -181,6 +182,9 @@ maybe_print_address (struct riscv_private_data *pd, int base_reg, int offset, pd->print_addr = pd->gp + offset; else if (base_reg == X_TP || base_reg == 0) pd->print_addr = offset; + else + return; + pd->to_print_addr = true; /* Sign-extend a 32-bit value to a 64-bit value. */ if (wide) @@ -596,7 +600,7 @@ riscv_disassemble_insn (bfd_vma memaddr, insn_t word, disassemble_info *info) pd = info->private_data = xcalloc (1, sizeof (struct riscv_private_data)); pd->gp = -1; - pd->print_addr = -1; + pd->to_print_addr = false; for (i = 0; i < (int)ARRAY_SIZE (pd->hi_addr); i++) pd->hi_addr[i] = -1; @@ -662,13 +666,13 @@ riscv_disassemble_insn (bfd_vma memaddr, insn_t word, disassemble_info *info) print_insn_args (op->args, word, memaddr, info); /* Try to disassemble multi-instruction addressing sequences. */ - if (pd->print_addr != (bfd_vma)-1) + if (pd->to_print_addr) { info->target = pd->print_addr; (*info->fprintf_styled_func) (info->stream, dis_style_comment_start, " # "); (*info->print_address_func) (info->target, info); - pd->print_addr = -1; + pd->to_print_addr = false; } /* Finish filling out insn_info fields. */ -- 2.34.1