From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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 808F5300089; Mon, 21 Aug 2023 07:27:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irq.a4lg.com; s=2017s01; t=1692602853; bh=JjA7zSXI2TRG+faZu6xVDarMOa43tZK8MrsnWc0oqGE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Mime-Version:Content-Transfer-Encoding; b=JtDgtAL5NYh2KIwWevSUKi8+dsp+5gq2QiaQ/IT/svYFdO9hX95OU6WGQwHfcBMQN 5RuC0Z47pru6xmuA5EWlS7brnTHwKCgD1w9S58qOPZuMNoJsl9l9DOk1yPclt4CEAe bct4QK/VPhb9mrCkmE05maJj7e2n0k+goLOs8Dtw= From: Tsukasa OI 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 Content-Transfer-Encoding: 8bit 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 List-Id: 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); } -- 2.41.0