From patchwork Sat Oct 8 04:34:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1830 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp607883wrs; Fri, 7 Oct 2022 21:34:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4UhZETReUBGP+p9w6ANQlvsKxIA35ez2r8WWpWwIHa1H3BO3tj5OuJgrLsWhSCm1CJ4h2U X-Received: by 2002:a17:907:60cb:b0:785:4ec0:551f with SMTP id hv11-20020a17090760cb00b007854ec0551fmr6475170ejc.179.1665203691489; Fri, 07 Oct 2022 21:34:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665203691; cv=none; d=google.com; s=arc-20160816; b=VTjrmcayJw+iQbEO441d4JHMxMM/dLwQ2Wwmlu9aj8VGva5tQG1EDod2c0yP9GafUD cg1hNbcf/K2uxKUNY0Ex0Isg3PevUXQvT97FKaVAZSRVR++LynnkyGDG0MmcAu87E+Vk mNrvWv//d5j26HNFTIq4/oeO5o7XO7gaj11Qikaost17xbOaMiUzZhuFLevT+K3tNtq8 pDZkWcqh/xZvzCmaKPkeDHxhI5KJOuEBtRUhgkp04Wi16zJH2pOf44kq7z62sGKkZkZk 2s31k4GYfFDT/Lbd/BZh0UchGTSD22QmxomBqtvTivoBFYlGrOFPoE/rT0J1hviy9ffm gNLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=rUVkEJj6YIuobHhLQI1Akjf+m4CBHT+E6jEUBZZGeLM=; b=xx/LFhQ/Nzv6snH/4YBbJ8pAAaROTTUtCqiHdd6i6Tnek4N6zpTbxWtJkpH6ucQvlK DMWBF0xgvvpMUlCCCvrX9h8xnwjBjkmy7KwXbmFa1UvsdCjBEij+2/UjLQUrpNrIP6ru cOQwihmOYQnsc7L2T5IigtfsUuGa2ROVcpVhez6J0AWjNCI9OQR7AvH4Eh2Jg2FAlTrj 1etISgU0EqE+XitzQNXRVagw//OGhGdUXIT217Dri1GJT5+P4ErljM8aJzbcfm3HMkiT 1IQvkC591DLeeLK9vnyUUMuqHrcWXhp0UWlIKTaENSjk4IoAN76eFfHiVET+E+fkn7Li pu/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=WBV0urqk; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id hg3-20020a1709072cc300b0078d7790fefdsi2752023ejc.927.2022.10.07.21.34.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 21:34:51 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=WBV0urqk; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 046EF38A8145 for ; Sat, 8 Oct 2022 04:34:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 046EF38A8145 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665203690; bh=rUVkEJj6YIuobHhLQI1Akjf+m4CBHT+E6jEUBZZGeLM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=WBV0urqktQpqPQ/ipLT3wjIUM+OEpcivuDpQqk6fWRe2wHZ58LQv9LG6Dh95q1wgU SOWDAbcq01kmFd7eMLPdNJGIMqvds2oNC4/WnA+979kRHXU8cOrNWCraeNozJ6Bshe A5iGCg7CnXTMFAqiPwlrokZyL66/eOFloiXgKw/Y= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org 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 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) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt 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 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 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-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Cc: binutils@sourceware.org Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746092625991429410?= X-GMAIL-MSGID: =?utf-8?q?1746092625991429410?= 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; From patchwork Sat Oct 8 04:34:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp608340wrs; Fri, 7 Oct 2022 21:36:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5/WAZ055j1C+oJhLykVBWR/mm+NktSkTKWyxRYxWcrH3YCqSaDxrY7owVB3IWL4l0Xz+LJ X-Received: by 2002:a05:6402:2793:b0:451:fd7d:fc0b with SMTP id b19-20020a056402279300b00451fd7dfc0bmr7526094ede.13.1665203781334; Fri, 07 Oct 2022 21:36:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665203781; cv=none; d=google.com; s=arc-20160816; b=XcoQqFeOdfvLfA1p9TbFMVGLux7yBpYKlqpLvskSd8PADA6c4FxES/wfLZQqXxornN aTHR2nIUO8sMQ11mPa6U1qIw6qBlYpp68GZqZubecR4r7Ur//KYkj85x+pfnVIVr1tqk I11Amz3gvoy+bFuZV5pWKKZ/Sep6I5sa3QxJP+7WkPye5fvrJjSVcBaelh9vZAndSPU5 KBbxWMsnOEoVDN82EeRa1OaEsgd+Fpkk3a51eoinnAwyLdhalRRJiXhmIWLMFRo5Bj1c fevEhXjkTWKYwUHkCc7TAcV3NdAawOoRpsDfURnOPREVJ6RcGrk+sWUjOw0ispzs2389 Qoqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=OfTXO/GYtxPCVIkUKCq6YQ0agUAtY6pn9V8Hg+dAPtA=; b=x2Ddtrqa7yJnWRkdTku/Jo6gixlTKnSMsy0zRDoEBf3GUQoWks/AD9vJaYq/sqhOam yO5j4PqRwrSqVmX50VX2g/Cd46UOnPPFEqUPsnEet9OYX0gYZfzpmpvqCZLtn8aVpHTS pTHrGcHoRi2CaqhAtHIs7jf3GHV+Kh/2AqgWIX5me+La+0H/SQg3UdWvnGMQ8tI1bRSO hEDEIdiN63GiUqJsfBdNwUkEwBsPQveTBb4hmQBKG1lDCANRtXQmOtHnz17YXjolS3nP awvjLguFmLTKBtMRf+8XS1+8AOBIESWeVQ1CycpuvLhko2Eqre1flp05eyp0pQlMApnD QU8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=FerOlnZW; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id qk11-20020a1709077f8b00b00782525053dbsi4802526ejc.699.2022.10.07.21.36.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 21:36:21 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=FerOlnZW; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2D8E93986406 for ; Sat, 8 Oct 2022 04:35:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2D8E93986406 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665203739; bh=OfTXO/GYtxPCVIkUKCq6YQ0agUAtY6pn9V8Hg+dAPtA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=FerOlnZWwBynlBi56q8PpdMfyPDCifNUABZdL1EfHyo+k6huzciAcg81if/ogOQ8a Xe7V4V+j5AoP8wOw1ci0WUWYkLbFtYN9LvL6+SP80O8sN5Hwx2+bEwTHBCfO7envD1 BQ16IBe+KC0/m/2e4HUULoyUyjRFvQ15G0s3nMrM= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id F283E38A8161 for ; Sat, 8 Oct 2022 04:34:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F283E38A8161 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 4A01D300089; Sat, 8 Oct 2022 04:34:50 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Subject: [PATCH 2/5] opcodes/riscv-dis.c: Tidying with spacing Date: Sat, 8 Oct 2022 04:34:24 +0000 Message-Id: <1f1aa0838bf9c4f10a45fcfe3c682f7efc79d9ae.1665203660.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 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 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-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Cc: binutils@sourceware.org Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746092720333152813?= X-GMAIL-MSGID: =?utf-8?q?1746092720333152813?= Before changing the core disassembler, we take care of minor code clarity issues and improve readability. This commit takes care of improper spacing for code clarity. opcodes/ChangeLog: * riscv-dis.c (riscv_disassemble_insn): Tidying with spacing. --- 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 2d1faf26eb3..088d0d91080 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -715,7 +715,7 @@ riscv_disassemble_insn (bfd_vma memaddr, insn_t word, disassemble_info *info) } /* If arch has the Zfinx extension, replace FPR with GPR. */ - if(riscv_subset_supports (&riscv_rps_dis, "zfinx")) + if (riscv_subset_supports (&riscv_rps_dis, "zfinx")) riscv_fpr_names = riscv_gpr_names; for (; op->name; op++) From patchwork Sat Oct 8 04:34:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1831 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp608074wrs; Fri, 7 Oct 2022 21:35:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4edwliWo/Fm0aLVPEyC3T8wdwSd4C5JxlkRs5mwFTwGwWuO6T9fP8ebSUP5Rtl0QtwPagr X-Received: by 2002:a17:907:8688:b0:78b:eaa5:8a9d with SMTP id qa8-20020a170907868800b0078beaa58a9dmr6605251ejc.509.1665203730069; Fri, 07 Oct 2022 21:35:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665203730; cv=none; d=google.com; s=arc-20160816; b=FkNDhPG/NS1v6xOWU+yFrShYMq9QzDB1AWD7hHxHdEjh5P2zDp+spvJkUKHFbos03Z WHjjEj5wcYz4rMRxvtHAHswkDRU/dh0rMxSFPVZY2Hp2cLY9aY3uZyxTVwVAKCXXyLki Ew1/dnpbwyOgPNqmsDBOUmMA5ra+pajhIQ1PdKXcq/b+ODA0MiAnZANIxIOEmsIFFUHL eM4V+mrGA7Hq+GLMPGPjwObdxdGAfwt28frWhddA2qyQJeLOFrOFokX7ZP5DhPUUyouz uSvZV9YBkUY65biTS5aeaG41elp+dhws+rsn3PpOukXdDg1ClpoPNRW8P6RpNOawJJGP d8QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=z6I+cWU1H2yp2dH2ZfkDKmoLtNptWcbRIWPdSaqbhRg=; b=HKQG6dT+26ZfPtObF8hZGAfJMCBs2rtrLn1U2ldWUslbL29S2/WXTBlYi1BFVlzSR2 DWR2UoBebBSM8VTMOi8rw4qLyzbSoz8/QKp0PQR5xSvAHf2qDNS7PBXTLQEI4BZr4rcO K4WPKcTsKnupxuPj4PW1iV0/F5eGntQld7DSLuTLs2ocEHOGs6RsQJ76rH/1mrYVkRxr Rg8k/8qRPBNNLA0/2s0jsQrqdkVkg8/VkifKUrQ2zamb3KI+dxOtZPeZrqON6tAeOWbK c3PW+hodesgZ2dL0TYVAYNwP7vCAn9TeV4r5EovjFDsc0qEqsIkh/PidWgAzLC/gLZyH 1blQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=HX8F8JZ2; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id m6-20020a50d7c6000000b004483a12fba9si3724835edj.210.2022.10.07.21.35.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 21:35:30 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=HX8F8JZ2; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1C144395B46B for ; Sat, 8 Oct 2022 04:35:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C144395B46B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665203710; bh=z6I+cWU1H2yp2dH2ZfkDKmoLtNptWcbRIWPdSaqbhRg=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=HX8F8JZ215Pxi5VTBNGFCqNKulDNgKDqMD61TQFjeAJfrmBP7UPTkFsN1GG337J0z KhyJT1cfkeDlpJywplaAX1A+C2dFzA3k5vVbi8jiygCYHO8+u05esanHbkta20cbbC Xt7fYelCCkmJblXNo8dx1sRlc1vuqrMSYrWH+wzw= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id 7599B38A8161 for ; Sat, 8 Oct 2022 04:35:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7599B38A8161 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id CA578300089; Sat, 8 Oct 2022 04:35:00 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Subject: [PATCH 3/5] opcodes/riscv-dis.c: Use bool type whenever possible Date: Sat, 8 Oct 2022 04:34:25 +0000 Message-Id: <740bc5e2d2618d236519b39fedd1a1d7ae4e05da.1665203660.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 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 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-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Cc: binutils@sourceware.org Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746092666779641453?= X-GMAIL-MSGID: =?utf-8?q?1746092666779641453?= Before changing the core disassembler, we take care of minor code clarity issues and improve readability. This commit replaces uses of int with bool whenever possible. opcodes/ChangeLog: * riscv-dis.c (no_aliases) Change type to bool. (set_default_riscv_dis_options): Use boolean. (parse_riscv_dis_option_without_args): Likewise. (riscv_disassemble_insn): Use boolean keywords. --- opcodes/riscv-dis.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 088d0d91080..608670bed7f 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -71,7 +71,7 @@ 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; +static bool no_aliases = false; /* Set default RISC-V disassembler options. */ @@ -81,7 +81,7 @@ set_default_riscv_dis_options (void) { riscv_gpr_names = riscv_gpr_names_abi; riscv_fpr_names = riscv_fpr_names_abi; - no_aliases = 0; + no_aliases = false; } /* Parse RISC-V disassembler option (without arguments). */ @@ -90,7 +90,7 @@ static bool parse_riscv_dis_option_without_args (const char *option) { if (strcmp (option, "no-aliases") == 0) - no_aliases = 1; + no_aliases = true; else if (strcmp (option, "numeric") == 0) { riscv_gpr_names = riscv_gpr_names_numeric; @@ -645,7 +645,7 @@ static int riscv_disassemble_insn (bfd_vma memaddr, insn_t word, disassemble_info *info) { const struct riscv_opcode *op; - static bool init = 0; + static bool init = false; static const struct riscv_opcode *riscv_hash[OP_MASK_OP + 1]; struct riscv_private_data *pd; int insnlen; @@ -659,7 +659,7 @@ riscv_disassemble_insn (bfd_vma memaddr, insn_t word, disassemble_info *info) if (!riscv_hash[OP_HASH_IDX (op->match)]) riscv_hash[OP_HASH_IDX (op->match)] = op; - init = 1; + init = true; } if (info->private_data == NULL) From patchwork Sat Oct 8 04:34:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1833 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp608594wrs; Fri, 7 Oct 2022 21:37:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5lnngnjeytwoimD9IXIOWulSj3/Xq64FdjEfnRwwmEMC8ItjH0gDZWIfi5+cpCYRHvr7D/ X-Received: by 2002:a05:6402:f08:b0:459:5f08:1b26 with SMTP id i8-20020a0564020f0800b004595f081b26mr7520379eda.190.1665203829131; Fri, 07 Oct 2022 21:37:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665203829; cv=none; d=google.com; s=arc-20160816; b=mc9ZT3HFY94v5eSMKtKs44zzbaqwawd70FyS1rYbNtJgNtvKQFq9oATwkGrfVDpnAF bT5E7hTjAO1oUqId+Fr06hDk+LvYpkiOI3ak9omcJghlhtNB4KFyosP0ZKztjZzW5wgl hKkqRjUY7dNaEDhNCL5dy0D37gl4m3zcrJ/lxi1AwqFqW9JJya1ehN1Jeh0b86ePIygG F8NENZAoiTrzyy7q1qYnUxMPzguWmhL50UCPBFxTaqdqYKmgyciFrc6ay23ks3efQeiR XAEh1kHYUi9S4CmJ+c0bwTFGwyLT0rMIq6/yQdbgjCaEo9ESg3LQxcCbJW/DKVsFUy+e rLtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=oESbv2Vgx+RhAkCUSqeHSWlQzDYjFd3JMJlJ0Y87N5U=; b=UO6m+cL8sMCXiv/DWhyfbNva0L+1NAq+upcAxTkVWr4S2z74zSU1sdjAQZto7e10H5 CAlO19qawuhXHmYi78/de+eUmohLYpWIO8tlAECKRNiVw/6cjAl2oFEfMP5M6NXmNgaR 8Wi8AW9AXRoiwF1Gi5KCk1autTZYm89J6+jEKLa3THgmFpsraaagpqsMPCcm9EyF/sZa u/EPOjx8q509bKQ5Nr53dKEL9y4f3JF8Q+oFAe1YWZZTd3oPKOtj83FjyqmWjg1Il1T2 7fKMnbxIuF+PTqvi0eDp5zetr7ruLWrZbUWRvumeKWSJsBgtvujK6FLEVP81Y6u9X9SN 9/Hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Krvf84pg; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id a26-20020a170906245a00b0077a6429787dsi3755385ejb.157.2022.10.07.21.37.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 21:37:09 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Krvf84pg; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ED6BA39730DB for ; Sat, 8 Oct 2022 04:36:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED6BA39730DB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665203769; bh=oESbv2Vgx+RhAkCUSqeHSWlQzDYjFd3JMJlJ0Y87N5U=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Krvf84pgPRnJ0DkQDkxt8DyHWFjkl5VJgNvblyfjg8zRvYMY7rKE0YMBB2t7w/RAT U+T4HwuhToHNKvG7d3its/NbEFT566QOeGZNUbGOgorHFponTTIzWliDHTZlrlxOTn U0whJz0GffCRDrSgC8NOvh1L8c45dkvGBQOoevT0= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id 0793B396E468 for ; Sat, 8 Oct 2022 04:35:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0793B396E468 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 542BE300089; Sat, 8 Oct 2022 04:35:11 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Subject: [PATCH 4/5] opcodes/riscv-dis.c: Make XLEN variable static Date: Sat, 8 Oct 2022 04:34:26 +0000 Message-Id: <6e3a9c235e317f441b4383b3daa68f2051bdc149.1665203660.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 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 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-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Cc: binutils@sourceware.org Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746092770004909107?= X-GMAIL-MSGID: =?utf-8?q?1746092770004909107?= Before changing the core disassembler, we take care of minor code clarity issues and improve readability. Since xlen variable is not (and should not) used outside riscv-dis.c, this commit makes this variable static. opcodes/ChangeLog: * riscv-dis.c (xlen): Make this variable static. --- 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 608670bed7f..27e1978d428 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -33,7 +33,7 @@ #include /* Current XLEN for the disassembler. */ -unsigned xlen = 0; +static unsigned xlen = 0; /* Default ISA specification version (constant as of now). */ static enum riscv_spec_class default_isa_spec = ISA_SPEC_CLASS_DRAFT - 1; From patchwork Sat Oct 8 04:34:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 1834 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp608852wrs; Fri, 7 Oct 2022 21:38:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7dLtNaYLwKi27RjAwWh1bROrzcaU2HEgBJfhLYnoXd+q49c4glgiV1xkckhVt/tP9gV5LS X-Received: by 2002:a05:6402:3806:b0:450:bad8:8cd5 with SMTP id es6-20020a056402380600b00450bad88cd5mr7643378edb.305.1665203897304; Fri, 07 Oct 2022 21:38:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665203897; cv=none; d=google.com; s=arc-20160816; b=oemYy40xlBmI9KKA1Cegd54a+Z2p5iT5mXrFiYyOSd2/3uxEzGgvj/dqZSm/ar8AQy WcF9JUdp7tci8kAu1gQF43xSrK/aOejz7VNmxAPCYoR47T7uOl0UE4aOjwCy3nYnUNk3 VMXO0o9wkQVU5SmzK+AklTq0jw8yPxz79XvRl7KiPKn4sV2EB4rc7R/DMfqpYAgim/RI mA32ngCbQ6fAaq2/ywsZB3Kle4fCEz1Y9FLmCQlGDfbg3+gUwIko7LQkUGxMriOHLyOr IfSVlG6YH1IdSQKJhuae+5psTWD1Te6bxW6I93l6gO/kV00r4IfT6Zefrw6X2NF1lRmd jgbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=MUQGE3Wc9vh8DdGshamFB+89NN4CEoflsmMVyBjr0/E=; b=ImhqWXheRiKyDxxiKFIe7hc9ur7Q9wASoQDnkyaOO6WSPvHeKAv9V5wztoLACeS6xl nx+p/S3iuPeO1a0o3mNSiVz0OwvwiE5kWWblgoVh0ISejYf8whoyaXoMitdvVoKCkU/C 1A1axmzSYlHFwnDskK7gfe2LnO2nbizkHRrC63UmHPZNZ2opLSbLuA8iWpu7kA6mJbNO sTr4k9k8Su8YT+qicO3SY4HRCFIUqe3Itd3Cm09ed1X7zyoC/CJt0qM1tLyWclXZNSm2 QrGwgzzqH/lcskLOWhCj8vkxpPEOU7bniGVL3RUVsRMA1rT1e+BAb5kPO0Oz9rlAx4w0 iKtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ErppLH1N; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id h8-20020a05640250c800b00457dac9ce7esi4814048edb.322.2022.10.07.21.38.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 21:38:17 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ErppLH1N; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C3611398AC22 for ; Sat, 8 Oct 2022 04:37:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3611398AC22 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665203836; bh=MUQGE3Wc9vh8DdGshamFB+89NN4CEoflsmMVyBjr0/E=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=ErppLH1NPKuyXI1vSVvXe0iyBTXSxSAyn9WCi4tVhphGv/Cyrcw/Tqli1C4CyVwNs /zSQZJqkJnimQc3nYY0NxpVcmZCX4IxdMlI6fsLqYtfOXQytxTgUNu9siPOIe5xifR ZHKlXcJrxpWKYKzqPY2JHXC4cLfbjVJnZOcHnKK4= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org 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 8284C39730DB for ; Sat, 8 Oct 2022 04:35:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8284C39730DB Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id D5C1C300089; Sat, 8 Oct 2022 04:35:21 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Subject: [PATCH 5/5] opcodes/riscv-dis.c: Remove last_map_state Date: Sat, 8 Oct 2022 04:34:27 +0000 Message-Id: In-Reply-To: References: Mime-Version: 1.0 X-Spam-Status: No, score=-12.1 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-Patchwork-Original-From: Tsukasa OI via Binutils From: Tsukasa OI Reply-To: Tsukasa OI Cc: binutils@sourceware.org Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746092841421303621?= X-GMAIL-MSGID: =?utf-8?q?1746092841421303621?= Before changing the core disassembler, we take care of minor code clarity issues and improve readability. This commit removes unused variable last_map_state (set by the print_insn_riscv function but not read anywhere else). opcodes/ChangeLog: * riscv-dis.c (last_map_state): Remove. (print_insn_riscv): Remove setting last_map_state. --- opcodes/riscv-dis.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 27e1978d428..daeb1b5fd15 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -64,7 +64,6 @@ struct riscv_private_data /* Used for mapping symbols. */ 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; @@ -1041,8 +1040,6 @@ print_insn_riscv (bfd_vma memaddr, struct disassemble_info *info) set_default_riscv_dis_options (); mstate = riscv_search_mapping_symbol (memaddr, info); - /* Save the last mapping state. */ - last_map_state = mstate; /* Set the size to dump. */ if (mstate == MAP_DATA