From patchwork Mon Aug 21 07:27:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 136342 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2838042vqi; Mon, 21 Aug 2023 00:29:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG1ObfB23OOa9OkJtiywQaVGcxTBRr5Qc4MuXgiGDehu7RAxmlEEEUwlibe9u9D28NZKVD4 X-Received: by 2002:a17:906:214:b0:99b:ea8f:9003 with SMTP id 20-20020a170906021400b0099bea8f9003mr4936442ejd.50.1692602962329; Mon, 21 Aug 2023 00:29:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692602962; cv=none; d=google.com; s=arc-20160816; b=KhWzODuCDZJsAcLxCHQSpun2gJc8HYK4BGrc5+9ULKzxx01LEEcInlvzBkp8mbc4G5 7gCSifAXaobjzZsDZsywcoGghVZi5I7CrE41ZfaWiRO+FfpGPThEkHZXRwEE8xaU/MrE kmmjnBK/navnJnncC2qmHPXrJtoDzwbrVeKom1/talSyTGg9WAYtbNrm1cIeZX0WYuIO +x5YEuwkrRNEv8K+fNGrUN0OkUQJq2/k0/vVYOQ3bDJxKuWOQdVNizSsjYW7PjBDhpfP elYFZrajzNQgtV4y7zOH8WvbRitv72XDxf+m6PPS7FgLdVaEayuhnpgUCorwEFCi3Kyw mLbw== 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=JjA7zSXI2TRG+faZu6xVDarMOa43tZK8MrsnWc0oqGE=; fh=oLBbkpKGrMjsAiDUocfN7mW0LEnMJsqDdFE8uCs7/vo=; b=tmbwj/WbKee5a+/OdsTZ5BXHAz/UqUJWWoJdl7LWjnDG9CKsK1gA23dcr8REu3xYXG BoXm2RyWIPKZ1l9UnnePChTPKqVswkddBJq46Qr9duf1tXwUfJh+pwnOcb9feaPuq+rA pTFgyjZvBxYx3B3M0yx1wxULAWqSPuzc52/2pat/uCN3eF3y8UVmWWc2Du3t0kCF12DJ zohNErc5S8smenPR6i3T4LuUoFU8/+rht0wLsxddNartCkYHXKRc3tTqXoqHM0l7QcDE P/ke6thDCIKgegGPhX7KM70l2C3AG+zU3yBZyKXm64LhvyhlSWs8zose6dfVMX/XOw5E b/Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=NicYJhPl; 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i10-20020a170906264a00b0099d969e2d30si5443734ejc.192.2023.08.21.00.29.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 00:29:22 -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=NicYJhPl; 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 501243882117 for ; Mon, 21 Aug 2023 07:28:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 501243882117 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692602914; bh=JjA7zSXI2TRG+faZu6xVDarMOa43tZK8MrsnWc0oqGE=; 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=NicYJhPlUxlv2vRxvrDe6mZZDB0y0jFoSxCwMyqiwzm0q1TRyjMfLx8VL/2pQ/B7X it9pcraEslziowz/9NYp5ss+35U3y9GWP4zt2bOsnFw8hLQGIfNbBFnyC2VTMFDzVe ZfRaH58Zqp5JGb7nTGI+MOZMzzMk/whNHiayetdM= 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 4559D385B528 for ; Mon, 21 Aug 2023 07:27:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4559D385B528 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 808F5300089; Mon, 21 Aug 2023 07:27:33 +0000 (UTC) To: Tsukasa OI , Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu , Kito Cheng Cc: binutils@sourceware.org Subject: [PATCH 1/2] RISC-V: Add complex CSR error handling Date: Mon, 21 Aug 2023 07:27:05 +0000 Message-ID: <4e00819a3822f4f793c79663deff121e7e60ea8b.1692602822.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, KAM_MANYTO, 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: INBOX X-GMAIL-THRID: 1773898680971092456 X-GMAIL-MSGID: 1774822843489298333 From: Tsukasa OI This commit adds template for complex CSR error handling (such like multiple extensions involved). gas/ChangeLog: * config/tc-riscv.c (riscv_csr_address): Add complex CSR error handling. --- gas/config/tc-riscv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index 959cbbc32a5e..f587ea416f59 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -1020,6 +1020,8 @@ riscv_csr_address (const char *csr_name, bool need_check_version = false; bool is_rv32_only = false; bool is_h_required = false; + bool is_csr_req_complex = false; + bool csr_ok = false; const char* extension = NULL; switch (csr_class) @@ -1106,8 +1108,10 @@ riscv_csr_address (const char *csr_name, if (is_h_required && !riscv_subset_supports (&riscv_rps_as, "h")) as_warn (_("invalid CSR `%s', needs `h' extension"), csr_name); - if (extension != NULL - && !riscv_subset_supports (&riscv_rps_as, extension)) + if (is_csr_req_complex + ? !csr_ok + : (extension != NULL + && !riscv_subset_supports (&riscv_rps_as, extension))) as_warn (_("invalid CSR `%s', needs `%s' extension"), csr_name, extension); }