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 64593382F99C for ; Sat, 8 Oct 2022 04:34:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 64593382F99C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=irq.a4lg.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=irq.a4lg.com Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id B5165300089; Sat, 8 Oct 2022 04:34:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irq.a4lg.com; s=2017s01; t=1665203679; bh=rUVkEJj6YIuobHhLQI1Akjf+m4CBHT+E6jEUBZZGeLM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Mime-Version:Content-Transfer-Encoding; b=TKVBKPvyoHSgrkvR34w1WPY7d6a/wUMaPK1yNnh2P8br6f8De3VOKGloYnsbV5lhr 4zGkpbFsgKza5pS38l0JrJqUmz5Vsy6skGvnXdxCKYliZ6ZgrlyTQtL57bcFqAos26 jhmGGSbh+UvRNiSPFM6EJNNBTndZ8Erkxfkyrcg4= From: Tsukasa OI To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Cc: binutils@sourceware.org Subject: [PATCH 1/5] opcodes/riscv-dis.c: Tidying with comments/clarity Date: Sat, 8 Oct 2022 04:34:23 +0000 Message-Id: In-Reply-To: References: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.0 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 List-Id: Before changing the core disassembler, we take care of minor code clarity issues and improve readability. First, we need to clarify the roles of variables and code portions. opcodes/ChangeLog: * riscv-dis.c (xlen): Move before default_isa_spec. Add comment. (default_isa_spec, default_priv_spec): Add comment. (riscv_gpr_names, riscv_fpr_names): Likewise. (parse_riscv_dis_option_without_args): Likewise. (parse_riscv_dis_option, parse_riscv_dis_options): Likewise. (maybe_print_address): Likewise. (riscv_disassemble_insn): Fix comment about the Zfinx "extension". Add comment about the riscv_multi_subset_supports call. --- opcodes/riscv-dis.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 27a6bfe2283..2d1faf26eb3 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -32,10 +32,15 @@ #include #include +/* Current XLEN for the disassembler. */ +unsigned xlen = 0; + +/* Default ISA specification version (constant as of now). */ static enum riscv_spec_class default_isa_spec = ISA_SPEC_CLASS_DRAFT - 1; -static enum riscv_spec_class default_priv_spec = PRIV_SPEC_CLASS_NONE; -unsigned xlen = 0; +/* Default privileged specification + (as specified by the ELF attributes or the `priv-spec' option). */ +static enum riscv_spec_class default_priv_spec = PRIV_SPEC_CLASS_NONE; static riscv_subset_list_t riscv_subsets; static riscv_parse_subset_t riscv_rps_dis = @@ -61,12 +66,16 @@ static int last_map_symbol = -1; static bfd_vma last_stop_offset = 0; enum riscv_seg_mstate last_map_state; +/* Register names as used by the disassembler. */ static const char * const *riscv_gpr_names; static const char * const *riscv_fpr_names; /* If set, disassemble as most general instruction. */ static int no_aliases; + +/* Set default RISC-V disassembler options. */ + static void set_default_riscv_dis_options (void) { @@ -75,6 +84,8 @@ set_default_riscv_dis_options (void) no_aliases = 0; } +/* Parse RISC-V disassembler option (without arguments). */ + static bool parse_riscv_dis_option_without_args (const char *option) { @@ -90,6 +101,8 @@ parse_riscv_dis_option_without_args (const char *option) return true; } +/* Parse RISC-V disassembler option (possibly with arguments). */ + static void parse_riscv_dis_option (const char *option) { @@ -143,6 +156,8 @@ parse_riscv_dis_option (const char *option) } } +/* Parse RISC-V disassembler options. */ + static void parse_riscv_dis_options (const char *opts_in) { @@ -170,6 +185,8 @@ arg_print (struct disassemble_info *info, unsigned long val, (*info->fprintf_styled_func) (info->stream, dis_style_text, "%s", s); } +/* If we need to print an address, set its value and state. */ + static void maybe_print_address (struct riscv_private_data *pd, int base_reg, int offset, int wide) @@ -697,7 +714,7 @@ riscv_disassemble_insn (bfd_vma memaddr, insn_t word, disassemble_info *info) xlen = ehdr->e_ident[EI_CLASS] == ELFCLASS64 ? 64 : 32; } - /* If arch has ZFINX flags, use gpr for disassemble. */ + /* If arch has the Zfinx extension, replace FPR with GPR. */ if(riscv_subset_supports (&riscv_rps_dis, "zfinx")) riscv_fpr_names = riscv_gpr_names; @@ -712,7 +729,7 @@ riscv_disassemble_insn (bfd_vma memaddr, insn_t word, disassemble_info *info) /* Is this instruction restricted to a certain value of XLEN? */ if ((op->xlen_requirement != 0) && (op->xlen_requirement != xlen)) continue; - + /* Is this instruction supported by the current architecture? */ if (!riscv_multi_subset_supports (&riscv_rps_dis, op->insn_class)) continue; -- 2.34.1