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 9CDC43858C39 for ; Thu, 29 Dec 2022 03:55:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9CDC43858C39 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 F2577300089; Thu, 29 Dec 2022 03:55:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irq.a4lg.com; s=2017s01; t=1672286132; bh=Egl8e0w+0JomqWT7F4JSF68cjgJPOt6KQDpI3LkW+s0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Mime-Version:Content-Transfer-Encoding; b=SAbMyRtjCeTZyf6u6rhzNDWSpsYOFJzU6qOkijkc5Wn651PuAViHHNhWgua+BQljM K5IZFci0mkKVQPo57huj+KVDSCsWL5Z0DInN6Hrk2maBD1N/uxLKnazts1MJIEu0/Q bJpq6lxshbSDNb1W/igWmMZXIfyNBASbf/XlhHfU= From: Tsukasa OI 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 Content-Transfer-Encoding: 8bit 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 List-Id: 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: -- 2.39.0