From patchwork Fri Aug 11 02:39:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tsukasa OI X-Patchwork-Id: 134285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp815560vqi; Thu, 10 Aug 2023 19:40:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNw03PPzHndpg9sqEIwN64da7sKnpHdAvBL1YBYI48b4oDkz6WI1D07AtVbxW0legMD6Wk X-Received: by 2002:a17:906:7696:b0:994:2fa9:7446 with SMTP id o22-20020a170906769600b009942fa97446mr519600ejm.46.1691721611951; Thu, 10 Aug 2023 19:40:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691721611; cv=none; d=google.com; s=arc-20160816; b=xpvKOjltwdES8V8hTC+MSO7Y5RxPWVRuQc32dcKKZjXHr0Eh5GlWY1iwJwi4fn4/1C AXJu18I7Y/hMMTMet13DikJ+7iWQ1N2hCNBnNDeIcdvGamuIKJPU1A1do5ev5UUF1MDf KkvpUnJ37tkiZrmb/uCCdhjFeXm7W0emwBZ8qhlGrhqZ4LtgMtuFTcelwB8jk6mdk7fq xoSJWmGw8ol988+05PN2wm6PcolGGpJkf16H6uQL8Bv/IpzN7BURLHmozKlpIRTGkFR8 TqR2OrRP94jQ1NcOlXpyUiIeot8jDHmxQ5LHIBVCj7cj2EiBYu74cmk55NAEF6D6LDE7 uGFA== 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=D5Nr5TRS2Z6xsG7MIn+KprUjnFEi6cuVDW/hiUpNpcc=; fh=oLBbkpKGrMjsAiDUocfN7mW0LEnMJsqDdFE8uCs7/vo=; b=zTgW6aQ+ObHzh1p1WNoowyFSYzplj1r3+fVJqa3+mps3LBOA1tBinXoVGRtcfunTaT 9YNxi+hngLGkcEDs0UrrVz16BikKfUr6cXoRVuJsPjMI8eqYNh+UAPPEapJYLJhPTYie /Cu04ZohjUg+Lxn5p1A+OLNCtt2JhWMnXhKeqyTw/xkKnNj0b01KzkzVOk6kH1qLVykT uLEa5kHuyL8ornde9oSLNoTNzbosE1FHet23Zqbx8rCVPwQ1rabEhOKJzp2ChNXZhte4 uGg00xXtfTPnSsurnItW/nRpsWXDVLQPxo8/oquN2B3bUXSg/xE1g7+7ummA4NMHb2lY b96w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=PpiEWx+C; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id o27-20020a1709062e9b00b009886c3287e0si2419257eji.536.2023.08.10.19.40.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Aug 2023 19:40:11 -0700 (PDT) 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=PpiEWx+C; 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 B9DAF3858C52 for ; Fri, 11 Aug 2023 02:40:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B9DAF3858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1691721604; bh=D5Nr5TRS2Z6xsG7MIn+KprUjnFEi6cuVDW/hiUpNpcc=; 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=PpiEWx+C1LfiZBBHbpHpc6W5dEE8aRs13jECrAsRFOdqjEs20VafkIMxJcp9p3X+q Kg43BHDIaq5Lz5UA7Y4OsX6XPI1OX7OPo1UY2Voo9jVvzlv5hMnDhnMe0hYLYwbW3g GLyO4MzrL7G7erEV3uzAsZ1vYZ+A+MlV/rSux254= 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 ADA293858C1F for ; Fri, 11 Aug 2023 02:39:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ADA293858C1F Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id DB52C300089; Fri, 11 Aug 2023 02:39:54 +0000 (UTC) To: Tsukasa OI , Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu , Kito Cheng Cc: binutils@sourceware.org Subject: [REVIEW ONLY 1/2] RISC-V: Add complex CSR error handling Date: Fri, 11 Aug 2023 02:39:12 +0000 Message-ID: <8c535d608297289995fa7b0372ccb9cdb47e3edc.1691721525.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: 1773898680971092456 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 aaf8b9be64fd..91c449596749 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); }