From patchwork Thu Dec 29 03:55:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 37294 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2215618wrt; Wed, 28 Dec 2022 19:55:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXsdgOGg5w6MUeQuOhMAstQfK6FnXCbn//bIeZfBfsfL0wBNqWXRlU/sf4tdxvtGUjy/L8AD X-Received: by 2002:aa7:de08:0:b0:472:7c75:832 with SMTP id h8-20020aa7de08000000b004727c750832mr22819950edv.16.1672286133075; Wed, 28 Dec 2022 19:55:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672286133; cv=none; d=google.com; s=arc-20160816; b=Asvv0KmPR2kpQfGutTpveZiAvYHsiAwiGlDI3EATN2VP3NaONXnYzQdInPZeIAombp 9Y8Gi3U3ZYQD8scL0aOo711docTRCENh6AXArdWKzBK/pQ3pouUfVu4DcItp3tHNZNbw 2Jch6SZn9dVAUXSxIIEs4YJ3reMcKavmUbx2Z191OXwcIgJAyEuJoXphw9nTgHFwTzIi +SaApOFrLj2BeSdI7W8kZSNofAl5eMhllYaFXahBPFA72rVD33JCb3r8VhYIjisSsSlS l9wvvDvcIMUNsXy0dq7In+hPqARLu44dQS2iL1ICYkrardYTVmZtaDFebCt3z05T1ki+ 0v8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=UTqM8FVfg1wB3Zp/DskMETFJ0W5jQzHXPDcTdeqDgik=; b=GvYWsfGl+k0CXk6Z4a3n1euoA3/mfnNMo++OI7OP6iTrq5KbHuw8Mu6sxCdQf7d1dC IcxUhhVhElAadr7popK/HlfusVXv2RMD7eXfgqaXIydhLhrVIPkCEZQHAPoiadAlasg9 nz9Qa/gfsxLONDV8RP++Cbsiai1Hik7Q4MF5CeEdja/XTNROBaDFHwl6pZUiLsQ4UVap RTqHU9F9TzRFQOrAphWYMN56Ir9hvRScnkkUnBEUYfz+NiEFuk0/jWithR3Xtwfp5cNj GM2ehV8nKE1JcKVhX4mI17F28qKGHFhPtv+TmJDHXRm07Bw6JrFOmj8KZVBuzmppsW84 Ucbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=PtZcM73D; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id v21-20020a056402349500b004673015ab88si16467468edc.19.2022.12.28.19.55.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Dec 2022 19:55:33 -0800 (PST) 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=PtZcM73D; 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 1E0423858C39 for ; Thu, 29 Dec 2022 03:55:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E0423858C39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672286132; bh=UTqM8FVfg1wB3Zp/DskMETFJ0W5jQzHXPDcTdeqDgik=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=PtZcM73D9hcLgOlLqwgANvWLJLi+ZmPYoWK9OhV5YkodA94ABY3f0/GF4xqEbIk/x n8lNHAbrc3DjAx7UT/rqGYeImRZVDCGxVXkd7flToWcqw1oQXhNc88Lzyl96Ilrs/P I01878ZPIW3LKwHeIY/FZBJ14qnhfk7rtGaZ934g= 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 D8FAA3858D20 for ; Thu, 29 Dec 2022 03:55:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D8FAA3858D20 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 702C9300089; Thu, 29 Dec 2022 03:55:21 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Cc: binutils@sourceware.org Subject: [PATCH 1/2] RISC-V: Simplify riscv_csr_address logic on state enable extensions Date: Thu, 29 Dec 2022 03:55:05 +0000 Message-Id: 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 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?1753519104121704086?= X-GMAIL-MSGID: =?utf-8?q?1753519104121704086?= From: Tsukasa OI This commit makes CSR class handling for 'Smstateen' and 'Ssstateen' extensions simpler using fall-throughs (as used in CSR_CLASS_I{,_32}). gas/ChangeLog: * config/tc-riscv.c (riscv_csr_address): Simplify the logic for 'Smstateen' and 'Ssstateen' extensions. --- gas/config/tc-riscv.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) base-commit: dc20b8f00abb74e2c26846c615ec5ba3a62f8677 diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index 77c0d2e32abf..cc0d74921027 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -1049,9 +1049,10 @@ riscv_csr_address (const char *csr_name, case CSR_CLASS_SMAIA: extension = "smaia"; break; - case CSR_CLASS_SMSTATEEN: case CSR_CLASS_SMSTATEEN_32: - is_rv32_only = (csr_class == CSR_CLASS_SMSTATEEN_32); + is_rv32_only = true; + /* Fall through. */ + case CSR_CLASS_SMSTATEEN: extension = "smstateen"; break; case CSR_CLASS_SSAIA: @@ -1064,12 +1065,13 @@ riscv_csr_address (const char *csr_name, || csr_class == CSR_CLASS_SSAIA_AND_H_32); extension = "ssaia"; break; - case CSR_CLASS_SSSTATEEN: - case CSR_CLASS_SSSTATEEN_AND_H: case CSR_CLASS_SSSTATEEN_AND_H_32: - is_rv32_only = (csr_class == CSR_CLASS_SSSTATEEN_AND_H_32); - is_h_required = (csr_class == CSR_CLASS_SSSTATEEN_AND_H - || csr_class == CSR_CLASS_SSSTATEEN_AND_H_32); + is_rv32_only = true; + /* Fall through. */ + case CSR_CLASS_SSSTATEEN_AND_H: + is_h_required = true; + /* Fall through. */ + case CSR_CLASS_SSSTATEEN: extension = "ssstateen"; break; case CSR_CLASS_SSCOFPMF_32: From patchwork Thu Dec 29 03:55:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 37295 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2215822wrt; Wed, 28 Dec 2022 19:56:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXshwwae49F8pHUUQFNFPH9lRdzbko9OqMIdR9mxt9GZbhBA296bGdQzQcJDW6Exx+r5cQn9 X-Received: by 2002:a17:907:cbc8:b0:7c1:ed:171c with SMTP id vk8-20020a170907cbc800b007c100ed171cmr25972607ejc.26.1672286191335; Wed, 28 Dec 2022 19:56:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672286191; cv=none; d=google.com; s=arc-20160816; b=of8CXVp/EnPnukQd8tRt97B6g9DYCYnQgAcXok1eFTojh4OuSV67lInBhY/7ADMcjW Qqh/ydFVKlUADiyPPXCmhcOKjg0MMJ+n3bsjIIbBNNOnldWLYmJ+2rF0/WwqeLVwalT3 iLXlOcGC1oswp5Xb5ZZEYMpcWVThsVNOLKuKPPcK3iakyOUd2fEL+H7jUWr6VKiM5UmX J1p2966Tbm6cNo+ZWPYAIAjwz2Td3DLaKcsa5vWyWGBT7LxKM+5KtXClGuM6Fh8PY75h Q7emqH5K7bkvcIGfrtHYWWySWBqze0LRM+fMHb5hduFMTWZ1LqAOZelJn3UAKE5lftZp f2Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=Egl8e0w+0JomqWT7F4JSF68cjgJPOt6KQDpI3LkW+s0=; b=xrTk3GNFgb3U96wwr9W8HimR0izf/7KmjsQjk0WHLGgEHFPOkf1LP0mnTWced07IWq RYQ3ncMhM+wovNJ+nu+pWmxKCxM8cqPfHA0K7p3iW8wHchrFxSm3IREIMwrrxeQbdqoi V4JDyW3h/bztSKFiKU3RZ0rYfEHrAdWcP7iJ5p3SPmrt/HMljAyz8ugr9vxmx9IFZWK7 hU/IOQAlO1/ncdxxhUL9LiPKGlpHdFOKdzotHzMotCigVRZSEpvZBatbxqIweGC9cee5 1zMlrYb+LtIBucQmdr/q+6ErcV9V7Di6QU+ka/OwfifaDyjyiGKO+5dsNeocEyjk54J/ JELg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=WAdbm10u; 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 dm3-20020a170907948300b007ade3ea871esi13782370ejc.627.2022.12.28.19.56.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Dec 2022 19:56:31 -0800 (PST) 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=WAdbm10u; 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 2722D3858C52 for ; Thu, 29 Dec 2022 03:56:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2722D3858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672286190; bh=Egl8e0w+0JomqWT7F4JSF68cjgJPOt6KQDpI3LkW+s0=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=WAdbm10uszr6KbsC9Ej+kzYJmuCtzewyGcx3NSfhx01EX15CmZb8HfLMAtRAA4AzE dpkpxVJRp0oDoqTDxJoBRvc5Q9N7dAdTFnujFa2RQuB4PIWH3DRvSEdUM+VdUB8lrJ 0WjxrHtAlw9WSLpHKZC0kVstXK1NXoTUYk6vrG1I= 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 9CDC43858C39 for ; Thu, 29 Dec 2022 03:55:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9CDC43858C39 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id F2577300089; Thu, 29 Dec 2022 03:55:31 +0000 (UTC) To: Tsukasa OI , Nelson Chu , Kito Cheng , Palmer Dabbelt Cc: binutils@sourceware.org Subject: [PATCH 2/2] RISC-V: Reorder CSR classes related to 'Ssstateen' Date: Thu, 29 Dec 2022 03:55:06 +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 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?1753519165646478001?= X-GMAIL-MSGID: =?utf-8?q?1753519165646478001?= From: Tsukasa OI This is a generic tidying commit to fix a minor ordering issue on commit 15253318be09 ("RISC-V: Add 'Ssstateen' extension and its CSRs"). gas/ChangeLog: * config/tc-riscv.c (enum riscv_csr_class): Reorder 'Ssstateen'- related CSR classes. (riscv_csr_address): Likewise. --- gas/config/tc-riscv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index cc0d74921027..28df21351eef 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -80,11 +80,11 @@ enum riscv_csr_class CSR_CLASS_SSAIA_AND_H, /* Ssaia with H */ CSR_CLASS_SSAIA_32, /* Ssaia, rv32 only */ CSR_CLASS_SSAIA_AND_H_32, /* Ssaia with H, rv32 only */ + CSR_CLASS_SSCOFPMF, /* Sscofpmf only */ + CSR_CLASS_SSCOFPMF_32, /* Sscofpmf RV32 only */ CSR_CLASS_SSSTATEEN, /* S[ms]stateen only */ CSR_CLASS_SSSTATEEN_AND_H, /* S[ms]stateen only (with H) */ CSR_CLASS_SSSTATEEN_AND_H_32, /* S[ms]stateen RV32 only (with H) */ - CSR_CLASS_SSCOFPMF, /* Sscofpmf only */ - CSR_CLASS_SSCOFPMF_32, /* Sscofpmf RV32 only */ CSR_CLASS_SSTC, /* Sstc only */ CSR_CLASS_SSTC_AND_H, /* Sstc only (with H) */ CSR_CLASS_SSTC_32, /* Sstc RV32 only */ @@ -1065,6 +1065,12 @@ riscv_csr_address (const char *csr_name, || csr_class == CSR_CLASS_SSAIA_AND_H_32); extension = "ssaia"; break; + case CSR_CLASS_SSCOFPMF_32: + is_rv32_only = true; + /* Fall through. */ + case CSR_CLASS_SSCOFPMF: + extension = "sscofpmf"; + break; case CSR_CLASS_SSSTATEEN_AND_H_32: is_rv32_only = true; /* Fall through. */ @@ -1074,12 +1080,6 @@ riscv_csr_address (const char *csr_name, case CSR_CLASS_SSSTATEEN: extension = "ssstateen"; break; - case CSR_CLASS_SSCOFPMF_32: - is_rv32_only = true; - /* Fall through. */ - case CSR_CLASS_SSCOFPMF: - extension = "sscofpmf"; - break; case CSR_CLASS_SSTC: case CSR_CLASS_SSTC_AND_H: case CSR_CLASS_SSTC_32: