From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=znnl=43=rivosinc.com=nelson@sourceware.org>
Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d])
	by sourceware.org (Postfix) with ESMTPS id 4D5D93858D20
	for <binutils@sourceware.org>; Thu, 29 Dec 2022 05:14:20 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4D5D93858D20
Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com
Received: by mail-ot1-x32d.google.com with SMTP id m6-20020a9d7e86000000b0066ec505ae93so10972492otp.9
        for <binutils@sourceware.org>; Wed, 28 Dec 2022 21:14:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=rivosinc-com.20210112.gappssmtp.com; s=20210112;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:from:to:cc:subject:date:message-id:reply-to;
        bh=WrlL3fTA77FLXaigkHJvV7fLOK5YbwQBQWkdiEZghOQ=;
        b=TAPZNiwhmOHnHts8vbJNK+ETz9cFf6R56ypRMzq+tt1cxNp1e1mNuHQ7JE7JHIeBG0
         RQVz9qZS2LY4hhQbcUjk5BhxqisLjAyWYdmcVdfmIHAsjyQxPq+X/nNQtgEPwP2uXzsQ
         3bfsG+yJ7rA+Bw2d4OCwHqCfczv+uAhr4VqpqRMIoeVtFrU2/ha5T0SCEAUtJrPxbDnS
         9dSi7xzeT0zy99TCSf+1T0PePP8WpIuJ++1ATS6ypT63IXrQdajNcNdj+ESOkPtJl6t8
         9tcr7itc2Cfx4svAVJe9DlHQOUUHgETJBfKECnIKejcf1lEuhb6UqK8joeXf6Cn5yq5k
         R7QA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=cc:to:subject:message-id:date:from:in-reply-to:references
         :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=WrlL3fTA77FLXaigkHJvV7fLOK5YbwQBQWkdiEZghOQ=;
        b=PYINSAE9boiVkIsV1ELqDlpO4sWFwSQ4hpZB9KvvUF6WQDoYBCCP1hgKltzYQ/6MTo
         M2nazLz+2tcnW81L/1imfZM4z9TdTSlgmKiMUb4Q72LChqY2efxaUCBL4QNr8T8LECNh
         heqB4ZsUZBEvdcLGka8+CsQ7hr2Fra0otiynhtTyBiaf0MlxhiI5Uf+JyzrGVjUFb0kf
         Qf3450yytJmtbJr+wb24VZLRpU2q2dz3NXIpQBK43TJW+MZatDnPrYIBvS07WbSz7Zxw
         hGD9u2ADN8lGxB4fOu9KIoEKM14W402pq6PYia9SF0BjhTDQMWAXeB9eTeISG/sJwxPe
         m3FA==
X-Gm-Message-State: AFqh2kqwCAIh4nSSKHL4LlYcMyP2VGvPEjnJUm7nK2B9KTe+vi5ZPLDh
	JwmKLjIZncTs5/SZFb0Z8uOE9a5nhJ+TtvJogg7qGg==
X-Google-Smtp-Source: AMrXdXtcsteNCxpFkkYir5j8CENYR1ILQZPYOWYEskYgJlpehqRQOFVCHNa0x5e+1ZR1pnBUm/7uEMhc5+nrPVl4C/8=
X-Received: by 2002:a9d:17e9:0:b0:670:82d5:fde3 with SMTP id
 j96-20020a9d17e9000000b0067082d5fde3mr1721160otj.22.1672290859276; Wed, 28
 Dec 2022 21:14:19 -0800 (PST)
MIME-Version: 1.0
References: <c509db05e4f1500736f4de994ed2aede544234d5.1672286099.git.research_trasio@irq.a4lg.com>
In-Reply-To: <c509db05e4f1500736f4de994ed2aede544234d5.1672286099.git.research_trasio@irq.a4lg.com>
From: Nelson Chu <nelson@rivosinc.com>
Date: Thu, 29 Dec 2022 13:14:08 +0800
Message-ID: <CAPpQWtCOUg_dgj5yRnCJ-oJKc3-+k+Kg0+Kod=cMpmEg-kBmsg@mail.gmail.com>
Subject: Re: [PATCH 1/2] RISC-V: Simplify riscv_csr_address logic on state
 enable extensions
To: Tsukasa OI <research_trasio@irq.a4lg.com>
Cc: Kito Cheng <kito.cheng@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, binutils@sourceware.org
Content-Type: text/plain; charset="UTF-8"
X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,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: <binutils.sourceware.org>

LGTM, thanks, please commit.

Nelson

On Thu, Dec 29, 2022 at 11:55 AM Tsukasa OI
<research_trasio@irq.a4lg.com> wrote:
>
> From: Tsukasa OI <research_trasio@irq.a4lg.com>
>
> 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(-)
>
> 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:
>
> base-commit: dc20b8f00abb74e2c26846c615ec5ba3a62f8677
> --
> 2.39.0
>