From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vk1-xa33.google.com (mail-vk1-xa33.google.com [IPv6:2607:f8b0:4864:20::a33]) by sourceware.org (Postfix) with ESMTPS id D6A0A394843A for ; Wed, 23 Feb 2022 06:58:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D6A0A394843A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=sifive.com Received: by mail-vk1-xa33.google.com with SMTP id j201so11762481vke.11 for ; Tue, 22 Feb 2022 22:58:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=zVzA4dzd6oImzhB6MeftTO8IBBvK9eTIBS9kdozFUVo=; b=CPzKBhdZXOUCnPqO0zK6TdQX6vTNjUx2QE/F4t49zicWMQ6wXytWFeybysIKOdpH2d dIiogVnZY3KVGGQXEvaRARPPP1EdjEFNl9Z5LdGTPLTIh+PBGMAJIKTS1jFM2RDBU5ZI uw5AxJGOGNPJZEtL/E+s8NPHwcNPpHNvA85+HpjV9Vz7ivXHFUkGYRSDgW1+mDTl+T2K gyWPIR/qzpb4uUXaYPTVQJoklLDQfEMSbj518tcSwjTpLCjqrK9rf6staPUzO71vlXAk u6BPfEurZPPlLDNlAq099VCQiTdA6xGMdsJnxv6J35BjhQ+WZeTzsVSvxsaZr30/N9Y6 SRVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=zVzA4dzd6oImzhB6MeftTO8IBBvK9eTIBS9kdozFUVo=; b=D1wXIAKQOTBo0pgiPnJhhsqX56M/EWYRDUoxvU30bGx68iiBf37F6jNEXQ47S8/Cxx WgzUhj79tDGSrJ2k/PxZoKncOKMQEA70vz4NdO4wHGvFxxJGGISTshFmvGxhV6PbmlkS R7vnNyTAgkGaq3FYF2JlILlc7T5T453iLced916dmjMthA/ovwatxd4PqrTQbVOepB11 1axJG2lepyrl/x6euKcSHZqV1TDoRXWxJOAY+9Qoh8k5ExCPlBl2Yfi6/1VGERB2JBum 1e/nn91CJU47rsmoCdkPmElCOL7+bkI4S27B6CISwSv8Inkf8af+zSH3s8SL4NEw73/g 47BA== X-Gm-Message-State: AOAM532uNsagkzedPhrjS6jn00GAI696IdQSRo233Ldv07wSMF+ESki/ nhNyXxn8nC3fX3it0D1fpBRF9HLZZ19bN+fkwegfiAwathd8Og== X-Google-Smtp-Source: ABdhPJzdb+3AG1FTx3ai1rSiQKEo0EkTHO++K7QoGzYuw7cAY9+IVM8sBTE1X/FAU3OWmxm25GF86gtHOlaF9A9AUcU= X-Received: by 2002:a05:6122:c6e:b0:330:cc8a:47bf with SMTP id i46-20020a0561220c6e00b00330cc8a47bfmr12219845vkr.13.1645599533900; Tue, 22 Feb 2022 22:58:53 -0800 (PST) MIME-Version: 1.0 References: <57c1b579d294614b46907a563fc3eb83548ca9b6.1641898723.git.research_trasio@irq.a4lg.com> In-Reply-To: <57c1b579d294614b46907a563fc3eb83548ca9b6.1641898723.git.research_trasio@irq.a4lg.com> From: Nelson Chu Date: Wed, 23 Feb 2022 14:58:43 +0800 Message-ID: Subject: Re: [PATCH 3/6] RISC-V: Add Privileged Arch 1.12 CSR testcases To: Tsukasa OI Cc: Binutils Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Wed, 23 Feb 2022 06:59:02 -0000 Committed with previous one. Thanks Nelson On Tue, Jan 11, 2022 at 7:02 PM Tsukasa OI via Binutils wrote: > > This commit adds testcases for most CSRs added on the Privileged > Architecture, version 1.12 (except moved "scontext" and > new "mscontext"). > > gas/ChangeLog: > > * testsuite/gas/riscv/csr-dw-regnums.s: Add new CSRs. > * testsuite/gas/riscv/csr-dw-regnums.d: Likewise. > * testsuite/gas/riscv/csr.s: Add new CSRs. > * testsuite/gas/riscv/csr-version-1p9p1.d: Likewise. > * testsuite/gas/riscv/csr-version-1p9p1.l: Likewise. > * testsuite/gas/riscv/csr-version-1p10.d: Likewise. > * testsuite/gas/riscv/csr-version-1p10.l: Likewise. > * testsuite/gas/riscv/csr-version-1p11.d: Likewise. > * testsuite/gas/riscv/csr-version-1p11.l: Likewise. > * testsuite/gas/riscv/csr-version-1p12.d: Likewise. > * testsuite/gas/riscv/csr-version-1p12.l: Likewise. > --- > gas/testsuite/gas/riscv/csr-dw-regnums.d | 69 +++++++++ > gas/testsuite/gas/riscv/csr-dw-regnums.s | 69 +++++++++ > gas/testsuite/gas/riscv/csr-version-1p10.d | 138 +++++++++++++++++ > gas/testsuite/gas/riscv/csr-version-1p10.l | 157 ++++++++++++++++++++ > gas/testsuite/gas/riscv/csr-version-1p11.d | 138 +++++++++++++++++ > gas/testsuite/gas/riscv/csr-version-1p11.l | 157 ++++++++++++++++++++ > gas/testsuite/gas/riscv/csr-version-1p12.d | 138 +++++++++++++++++ > gas/testsuite/gas/riscv/csr-version-1p12.l | 19 +++ > gas/testsuite/gas/riscv/csr-version-1p9p1.d | 138 +++++++++++++++++ > gas/testsuite/gas/riscv/csr-version-1p9p1.l | 157 ++++++++++++++++++++ > gas/testsuite/gas/riscv/csr.s | 69 +++++++++ > 11 files changed, 1249 insertions(+) > > diff --git a/gas/testsuite/gas/riscv/csr-dw-regnums.d b/gas/testsuite/gas/riscv/csr-dw-regnums.d > index 2aa5ff4bcee..e4bb865ed3f 100644 > --- a/gas/testsuite/gas/riscv/csr-dw-regnums.d > +++ b/gas/testsuite/gas/riscv/csr-dw-regnums.d > @@ -95,6 +95,7 @@ Contents of the .* section: > DW_CFA_offset_extended_sf: r4356 \(sie\) at cfa\+1040 > DW_CFA_offset_extended_sf: r4357 \(stvec\) at cfa\+1044 > DW_CFA_offset_extended_sf: r4358 \(scounteren\) at cfa\+1048 > + DW_CFA_offset_extended_sf: r4362 \(senvcfg\) at cfa\+1064 > DW_CFA_offset_extended_sf: r4416 \(sscratch\) at cfa\+1280 > DW_CFA_offset_extended_sf: r4417 \(sepc\) at cfa\+1284 > DW_CFA_offset_extended_sf: r4418 \(scause\) at cfa\+1288 > @@ -105,6 +106,7 @@ Contents of the .* section: > DW_CFA_offset_extended_sf: r7954 \(marchid\) at cfa\+15432 > DW_CFA_offset_extended_sf: r7955 \(mimpid\) at cfa\+15436 > DW_CFA_offset_extended_sf: r7956 \(mhartid\) at cfa\+15440 > + DW_CFA_offset_extended_sf: r7957 \(mconfigptr\) at cfa\+15444 > DW_CFA_offset_extended_sf: r4864 \(mstatus\) at cfa\+3072 > DW_CFA_offset_extended_sf: r4865 \(misa\) at cfa\+3076 > DW_CFA_offset_extended_sf: r4866 \(medeleg\) at cfa\+3080 > @@ -112,15 +114,34 @@ Contents of the .* section: > DW_CFA_offset_extended_sf: r4868 \(mie\) at cfa\+3088 > DW_CFA_offset_extended_sf: r4869 \(mtvec\) at cfa\+3092 > DW_CFA_offset_extended_sf: r4870 \(mcounteren\) at cfa\+3096 > + DW_CFA_offset_extended_sf: r4874 \(menvcfg\) at cfa\+3112 > + DW_CFA_offset_extended_sf: r4880 \(mstatush\) at cfa\+3136 > + DW_CFA_offset_extended_sf: r4890 \(menvcfgh\) at cfa\+3176 > + DW_CFA_offset_extended_sf: r5959 \(mseccfg\) at cfa\+7452 > + DW_CFA_offset_extended_sf: r5975 \(mseccfgh\) at cfa\+7516 > DW_CFA_offset_extended_sf: r4928 \(mscratch\) at cfa\+3328 > DW_CFA_offset_extended_sf: r4929 \(mepc\) at cfa\+3332 > DW_CFA_offset_extended_sf: r4930 \(mcause\) at cfa\+3336 > DW_CFA_offset_extended_sf: r4931 \(mtval\) at cfa\+3340 > DW_CFA_offset_extended_sf: r4932 \(mip\) at cfa\+3344 > + DW_CFA_offset_extended_sf: r4938 \(mtinst\) at cfa\+3368 > + DW_CFA_offset_extended_sf: r4939 \(mtval2\) at cfa\+3372 > DW_CFA_offset_extended_sf: r5024 \(pmpcfg0\) at cfa\+3712 > DW_CFA_offset_extended_sf: r5025 \(pmpcfg1\) at cfa\+3716 > DW_CFA_offset_extended_sf: r5026 \(pmpcfg2\) at cfa\+3720 > DW_CFA_offset_extended_sf: r5027 \(pmpcfg3\) at cfa\+3724 > + DW_CFA_offset_extended_sf: r5028 \(pmpcfg4\) at cfa\+3728 > + DW_CFA_offset_extended_sf: r5029 \(pmpcfg5\) at cfa\+3732 > + DW_CFA_offset_extended_sf: r5030 \(pmpcfg6\) at cfa\+3736 > + DW_CFA_offset_extended_sf: r5031 \(pmpcfg7\) at cfa\+3740 > + DW_CFA_offset_extended_sf: r5032 \(pmpcfg8\) at cfa\+3744 > + DW_CFA_offset_extended_sf: r5033 \(pmpcfg9\) at cfa\+3748 > + DW_CFA_offset_extended_sf: r5034 \(pmpcfg10\) at cfa\+3752 > + DW_CFA_offset_extended_sf: r5035 \(pmpcfg11\) at cfa\+3756 > + DW_CFA_offset_extended_sf: r5036 \(pmpcfg12\) at cfa\+3760 > + DW_CFA_offset_extended_sf: r5037 \(pmpcfg13\) at cfa\+3764 > + DW_CFA_offset_extended_sf: r5038 \(pmpcfg14\) at cfa\+3768 > + DW_CFA_offset_extended_sf: r5039 \(pmpcfg15\) at cfa\+3772 > DW_CFA_offset_extended_sf: r5040 \(pmpaddr0\) at cfa\+3776 > DW_CFA_offset_extended_sf: r5041 \(pmpaddr1\) at cfa\+3780 > DW_CFA_offset_extended_sf: r5042 \(pmpaddr2\) at cfa\+3784 > @@ -137,6 +158,54 @@ Contents of the .* section: > DW_CFA_offset_extended_sf: r5053 \(pmpaddr13\) at cfa\+3828 > DW_CFA_offset_extended_sf: r5054 \(pmpaddr14\) at cfa\+3832 > DW_CFA_offset_extended_sf: r5055 \(pmpaddr15\) at cfa\+3836 > + DW_CFA_offset_extended_sf: r5056 \(pmpaddr16\) at cfa\+3840 > + DW_CFA_offset_extended_sf: r5057 \(pmpaddr17\) at cfa\+3844 > + DW_CFA_offset_extended_sf: r5058 \(pmpaddr18\) at cfa\+3848 > + DW_CFA_offset_extended_sf: r5059 \(pmpaddr19\) at cfa\+3852 > + DW_CFA_offset_extended_sf: r5060 \(pmpaddr20\) at cfa\+3856 > + DW_CFA_offset_extended_sf: r5061 \(pmpaddr21\) at cfa\+3860 > + DW_CFA_offset_extended_sf: r5062 \(pmpaddr22\) at cfa\+3864 > + DW_CFA_offset_extended_sf: r5063 \(pmpaddr23\) at cfa\+3868 > + DW_CFA_offset_extended_sf: r5064 \(pmpaddr24\) at cfa\+3872 > + DW_CFA_offset_extended_sf: r5065 \(pmpaddr25\) at cfa\+3876 > + DW_CFA_offset_extended_sf: r5066 \(pmpaddr26\) at cfa\+3880 > + DW_CFA_offset_extended_sf: r5067 \(pmpaddr27\) at cfa\+3884 > + DW_CFA_offset_extended_sf: r5068 \(pmpaddr28\) at cfa\+3888 > + DW_CFA_offset_extended_sf: r5069 \(pmpaddr29\) at cfa\+3892 > + DW_CFA_offset_extended_sf: r5070 \(pmpaddr30\) at cfa\+3896 > + DW_CFA_offset_extended_sf: r5071 \(pmpaddr31\) at cfa\+3900 > + DW_CFA_offset_extended_sf: r5072 \(pmpaddr32\) at cfa\+3904 > + DW_CFA_offset_extended_sf: r5073 \(pmpaddr33\) at cfa\+3908 > + DW_CFA_offset_extended_sf: r5074 \(pmpaddr34\) at cfa\+3912 > + DW_CFA_offset_extended_sf: r5075 \(pmpaddr35\) at cfa\+3916 > + DW_CFA_offset_extended_sf: r5076 \(pmpaddr36\) at cfa\+3920 > + DW_CFA_offset_extended_sf: r5077 \(pmpaddr37\) at cfa\+3924 > + DW_CFA_offset_extended_sf: r5078 \(pmpaddr38\) at cfa\+3928 > + DW_CFA_offset_extended_sf: r5079 \(pmpaddr39\) at cfa\+3932 > + DW_CFA_offset_extended_sf: r5080 \(pmpaddr40\) at cfa\+3936 > + DW_CFA_offset_extended_sf: r5081 \(pmpaddr41\) at cfa\+3940 > + DW_CFA_offset_extended_sf: r5082 \(pmpaddr42\) at cfa\+3944 > + DW_CFA_offset_extended_sf: r5083 \(pmpaddr43\) at cfa\+3948 > + DW_CFA_offset_extended_sf: r5084 \(pmpaddr44\) at cfa\+3952 > + DW_CFA_offset_extended_sf: r5085 \(pmpaddr45\) at cfa\+3956 > + DW_CFA_offset_extended_sf: r5086 \(pmpaddr46\) at cfa\+3960 > + DW_CFA_offset_extended_sf: r5087 \(pmpaddr47\) at cfa\+3964 > + DW_CFA_offset_extended_sf: r5088 \(pmpaddr48\) at cfa\+3968 > + DW_CFA_offset_extended_sf: r5089 \(pmpaddr49\) at cfa\+3972 > + DW_CFA_offset_extended_sf: r5090 \(pmpaddr50\) at cfa\+3976 > + DW_CFA_offset_extended_sf: r5091 \(pmpaddr51\) at cfa\+3980 > + DW_CFA_offset_extended_sf: r5092 \(pmpaddr52\) at cfa\+3984 > + DW_CFA_offset_extended_sf: r5093 \(pmpaddr53\) at cfa\+3988 > + DW_CFA_offset_extended_sf: r5094 \(pmpaddr54\) at cfa\+3992 > + DW_CFA_offset_extended_sf: r5095 \(pmpaddr55\) at cfa\+3996 > + DW_CFA_offset_extended_sf: r5096 \(pmpaddr56\) at cfa\+4000 > + DW_CFA_offset_extended_sf: r5097 \(pmpaddr57\) at cfa\+4004 > + DW_CFA_offset_extended_sf: r5098 \(pmpaddr58\) at cfa\+4008 > + DW_CFA_offset_extended_sf: r5099 \(pmpaddr59\) at cfa\+4012 > + DW_CFA_offset_extended_sf: r5100 \(pmpaddr60\) at cfa\+4016 > + DW_CFA_offset_extended_sf: r5101 \(pmpaddr61\) at cfa\+4020 > + DW_CFA_offset_extended_sf: r5102 \(pmpaddr62\) at cfa\+4024 > + DW_CFA_offset_extended_sf: r5103 \(pmpaddr63\) at cfa\+4028 > DW_CFA_offset_extended_sf: r6912 \(mcycle\) at cfa\+11264 > DW_CFA_offset_extended_sf: r6914 \(minstret\) at cfa\+11272 > DW_CFA_offset_extended_sf: r6915 \(mhpmcounter3\) at cfa\+11276 > diff --git a/gas/testsuite/gas/riscv/csr-dw-regnums.s b/gas/testsuite/gas/riscv/csr-dw-regnums.s > index 2431a23f37c..34635d9c04f 100644 > --- a/gas/testsuite/gas/riscv/csr-dw-regnums.s > +++ b/gas/testsuite/gas/riscv/csr-dw-regnums.s > @@ -85,6 +85,7 @@ _start: > .cfi_offset sie, 1040 > .cfi_offset stvec, 1044 > .cfi_offset scounteren, 1048 > + .cfi_offset senvcfg, 1064 > .cfi_offset sscratch, 1280 > .cfi_offset sepc, 1284 > .cfi_offset scause, 1288 > @@ -95,6 +96,7 @@ _start: > .cfi_offset marchid, 15432 > .cfi_offset mimpid, 15436 > .cfi_offset mhartid, 15440 > + .cfi_offset mconfigptr, 15444 > .cfi_offset mstatus, 3072 > .cfi_offset misa, 3076 > .cfi_offset medeleg, 3080 > @@ -102,15 +104,34 @@ _start: > .cfi_offset mie, 3088 > .cfi_offset mtvec, 3092 > .cfi_offset mcounteren, 3096 > + .cfi_offset menvcfg, 3112 > + .cfi_offset mstatush, 3136 > + .cfi_offset menvcfgh, 3176 > + .cfi_offset mseccfg, 7452 > + .cfi_offset mseccfgh, 7516 > .cfi_offset mscratch, 3328 > .cfi_offset mepc, 3332 > .cfi_offset mcause, 3336 > .cfi_offset mtval, 3340 > .cfi_offset mip, 3344 > + .cfi_offset mtinst, 3368 > + .cfi_offset mtval2, 3372 > .cfi_offset pmpcfg0, 3712 > .cfi_offset pmpcfg1, 3716 > .cfi_offset pmpcfg2, 3720 > .cfi_offset pmpcfg3, 3724 > + .cfi_offset pmpcfg4, 3728 > + .cfi_offset pmpcfg5, 3732 > + .cfi_offset pmpcfg6, 3736 > + .cfi_offset pmpcfg7, 3740 > + .cfi_offset pmpcfg8, 3744 > + .cfi_offset pmpcfg9, 3748 > + .cfi_offset pmpcfg10, 3752 > + .cfi_offset pmpcfg11, 3756 > + .cfi_offset pmpcfg12, 3760 > + .cfi_offset pmpcfg13, 3764 > + .cfi_offset pmpcfg14, 3768 > + .cfi_offset pmpcfg15, 3772 > .cfi_offset pmpaddr0, 3776 > .cfi_offset pmpaddr1, 3780 > .cfi_offset pmpaddr2, 3784 > @@ -127,6 +148,54 @@ _start: > .cfi_offset pmpaddr13, 3828 > .cfi_offset pmpaddr14, 3832 > .cfi_offset pmpaddr15, 3836 > + .cfi_offset pmpaddr16, 3840 > + .cfi_offset pmpaddr17, 3844 > + .cfi_offset pmpaddr18, 3848 > + .cfi_offset pmpaddr19, 3852 > + .cfi_offset pmpaddr20, 3856 > + .cfi_offset pmpaddr21, 3860 > + .cfi_offset pmpaddr22, 3864 > + .cfi_offset pmpaddr23, 3868 > + .cfi_offset pmpaddr24, 3872 > + .cfi_offset pmpaddr25, 3876 > + .cfi_offset pmpaddr26, 3880 > + .cfi_offset pmpaddr27, 3884 > + .cfi_offset pmpaddr28, 3888 > + .cfi_offset pmpaddr29, 3892 > + .cfi_offset pmpaddr30, 3896 > + .cfi_offset pmpaddr31, 3900 > + .cfi_offset pmpaddr32, 3904 > + .cfi_offset pmpaddr33, 3908 > + .cfi_offset pmpaddr34, 3912 > + .cfi_offset pmpaddr35, 3916 > + .cfi_offset pmpaddr36, 3920 > + .cfi_offset pmpaddr37, 3924 > + .cfi_offset pmpaddr38, 3928 > + .cfi_offset pmpaddr39, 3932 > + .cfi_offset pmpaddr40, 3936 > + .cfi_offset pmpaddr41, 3940 > + .cfi_offset pmpaddr42, 3944 > + .cfi_offset pmpaddr43, 3948 > + .cfi_offset pmpaddr44, 3952 > + .cfi_offset pmpaddr45, 3956 > + .cfi_offset pmpaddr46, 3960 > + .cfi_offset pmpaddr47, 3964 > + .cfi_offset pmpaddr48, 3968 > + .cfi_offset pmpaddr49, 3972 > + .cfi_offset pmpaddr50, 3976 > + .cfi_offset pmpaddr51, 3980 > + .cfi_offset pmpaddr52, 3984 > + .cfi_offset pmpaddr53, 3988 > + .cfi_offset pmpaddr54, 3992 > + .cfi_offset pmpaddr55, 3996 > + .cfi_offset pmpaddr56, 4000 > + .cfi_offset pmpaddr57, 4004 > + .cfi_offset pmpaddr58, 4008 > + .cfi_offset pmpaddr59, 4012 > + .cfi_offset pmpaddr60, 4016 > + .cfi_offset pmpaddr61, 4020 > + .cfi_offset pmpaddr62, 4024 > + .cfi_offset pmpaddr63, 4028 > .cfi_offset mcycle, 11264 > .cfi_offset minstret, 11272 > .cfi_offset mhpmcounter3, 11276 > diff --git a/gas/testsuite/gas/riscv/csr-version-1p10.d b/gas/testsuite/gas/riscv/csr-version-1p10.d > index 88da7240a78..ef4cb65f195 100644 > --- a/gas/testsuite/gas/riscv/csr-version-1p10.d > +++ b/gas/testsuite/gas/riscv/csr-version-1p10.d > @@ -165,6 +165,8 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+10559073[ ]+csrw[ ]+stvec,a1 > [ ]+[0-9a-f]+:[ ]+10602573[ ]+csrr[ ]+a0,scounteren > [ ]+[0-9a-f]+:[ ]+10659073[ ]+csrw[ ]+scounteren,a1 > +[ ]+[0-9a-f]+:[ ]+10a02573[ ]+csrr[ ]+a0,0x10a > +[ ]+[0-9a-f]+:[ ]+10a59073[ ]+csrw[ ]+0x10a,a1 > [ ]+[0-9a-f]+:[ ]+14002573[ ]+csrr[ ]+a0,sscratch > [ ]+[0-9a-f]+:[ ]+14059073[ ]+csrw[ ]+sscratch,a1 > [ ]+[0-9a-f]+:[ ]+14102573[ ]+csrr[ ]+a0,sepc > @@ -185,6 +187,8 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+f1359073[ ]+csrw[ ]+mimpid,a1 > [ ]+[0-9a-f]+:[ ]+f1402573[ ]+csrr[ ]+a0,mhartid > [ ]+[0-9a-f]+:[ ]+f1459073[ ]+csrw[ ]+mhartid,a1 > +[ ]+[0-9a-f]+:[ ]+f1502573[ ]+csrr[ ]+a0,0xf15 > +[ ]+[0-9a-f]+:[ ]+f1559073[ ]+csrw[ ]+0xf15,a1 > [ ]+[0-9a-f]+:[ ]+30002573[ ]+csrr[ ]+a0,mstatus > [ ]+[0-9a-f]+:[ ]+30059073[ ]+csrw[ ]+mstatus,a1 > [ ]+[0-9a-f]+:[ ]+30102573[ ]+csrr[ ]+a0,misa > @@ -199,6 +203,16 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+30559073[ ]+csrw[ ]+mtvec,a1 > [ ]+[0-9a-f]+:[ ]+30602573[ ]+csrr[ ]+a0,mcounteren > [ ]+[0-9a-f]+:[ ]+30659073[ ]+csrw[ ]+mcounteren,a1 > +[ ]+[0-9a-f]+:[ ]+30a02573[ ]+csrr[ ]+a0,0x30a > +[ ]+[0-9a-f]+:[ ]+30a59073[ ]+csrw[ ]+0x30a,a1 > +[ ]+[0-9a-f]+:[ ]+31002573[ ]+csrr[ ]+a0,0x310 > +[ ]+[0-9a-f]+:[ ]+31059073[ ]+csrw[ ]+0x310,a1 > +[ ]+[0-9a-f]+:[ ]+31a02573[ ]+csrr[ ]+a0,0x31a > +[ ]+[0-9a-f]+:[ ]+31a59073[ ]+csrw[ ]+0x31a,a1 > +[ ]+[0-9a-f]+:[ ]+74702573[ ]+csrr[ ]+a0,0x747 > +[ ]+[0-9a-f]+:[ ]+74759073[ ]+csrw[ ]+0x747,a1 > +[ ]+[0-9a-f]+:[ ]+75702573[ ]+csrr[ ]+a0,0x757 > +[ ]+[0-9a-f]+:[ ]+75759073[ ]+csrw[ ]+0x757,a1 > [ ]+[0-9a-f]+:[ ]+34002573[ ]+csrr[ ]+a0,mscratch > [ ]+[0-9a-f]+:[ ]+34059073[ ]+csrw[ ]+mscratch,a1 > [ ]+[0-9a-f]+:[ ]+34102573[ ]+csrr[ ]+a0,mepc > @@ -209,6 +223,10 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+34359073[ ]+csrw[ ]+mtval,a1 > [ ]+[0-9a-f]+:[ ]+34402573[ ]+csrr[ ]+a0,mip > [ ]+[0-9a-f]+:[ ]+34459073[ ]+csrw[ ]+mip,a1 > +[ ]+[0-9a-f]+:[ ]+34a02573[ ]+csrr[ ]+a0,0x34a > +[ ]+[0-9a-f]+:[ ]+34a59073[ ]+csrw[ ]+0x34a,a1 > +[ ]+[0-9a-f]+:[ ]+34b02573[ ]+csrr[ ]+a0,0x34b > +[ ]+[0-9a-f]+:[ ]+34b59073[ ]+csrw[ ]+0x34b,a1 > [ ]+[0-9a-f]+:[ ]+3a002573[ ]+csrr[ ]+a0,pmpcfg0 > [ ]+[0-9a-f]+:[ ]+3a059073[ ]+csrw[ ]+pmpcfg0,a1 > [ ]+[0-9a-f]+:[ ]+3a102573[ ]+csrr[ ]+a0,pmpcfg1 > @@ -217,6 +235,30 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+3a259073[ ]+csrw[ ]+pmpcfg2,a1 > [ ]+[0-9a-f]+:[ ]+3a302573[ ]+csrr[ ]+a0,pmpcfg3 > [ ]+[0-9a-f]+:[ ]+3a359073[ ]+csrw[ ]+pmpcfg3,a1 > +[ ]+[0-9a-f]+:[ ]+3a402573[ ]+csrr[ ]+a0,0x3a4 > +[ ]+[0-9a-f]+:[ ]+3a459073[ ]+csrw[ ]+0x3a4,a1 > +[ ]+[0-9a-f]+:[ ]+3a502573[ ]+csrr[ ]+a0,0x3a5 > +[ ]+[0-9a-f]+:[ ]+3a559073[ ]+csrw[ ]+0x3a5,a1 > +[ ]+[0-9a-f]+:[ ]+3a602573[ ]+csrr[ ]+a0,0x3a6 > +[ ]+[0-9a-f]+:[ ]+3a659073[ ]+csrw[ ]+0x3a6,a1 > +[ ]+[0-9a-f]+:[ ]+3a702573[ ]+csrr[ ]+a0,0x3a7 > +[ ]+[0-9a-f]+:[ ]+3a759073[ ]+csrw[ ]+0x3a7,a1 > +[ ]+[0-9a-f]+:[ ]+3a802573[ ]+csrr[ ]+a0,0x3a8 > +[ ]+[0-9a-f]+:[ ]+3a859073[ ]+csrw[ ]+0x3a8,a1 > +[ ]+[0-9a-f]+:[ ]+3a902573[ ]+csrr[ ]+a0,0x3a9 > +[ ]+[0-9a-f]+:[ ]+3a959073[ ]+csrw[ ]+0x3a9,a1 > +[ ]+[0-9a-f]+:[ ]+3aa02573[ ]+csrr[ ]+a0,0x3aa > +[ ]+[0-9a-f]+:[ ]+3aa59073[ ]+csrw[ ]+0x3aa,a1 > +[ ]+[0-9a-f]+:[ ]+3ab02573[ ]+csrr[ ]+a0,0x3ab > +[ ]+[0-9a-f]+:[ ]+3ab59073[ ]+csrw[ ]+0x3ab,a1 > +[ ]+[0-9a-f]+:[ ]+3ac02573[ ]+csrr[ ]+a0,0x3ac > +[ ]+[0-9a-f]+:[ ]+3ac59073[ ]+csrw[ ]+0x3ac,a1 > +[ ]+[0-9a-f]+:[ ]+3ad02573[ ]+csrr[ ]+a0,0x3ad > +[ ]+[0-9a-f]+:[ ]+3ad59073[ ]+csrw[ ]+0x3ad,a1 > +[ ]+[0-9a-f]+:[ ]+3ae02573[ ]+csrr[ ]+a0,0x3ae > +[ ]+[0-9a-f]+:[ ]+3ae59073[ ]+csrw[ ]+0x3ae,a1 > +[ ]+[0-9a-f]+:[ ]+3af02573[ ]+csrr[ ]+a0,0x3af > +[ ]+[0-9a-f]+:[ ]+3af59073[ ]+csrw[ ]+0x3af,a1 > [ ]+[0-9a-f]+:[ ]+3b002573[ ]+csrr[ ]+a0,pmpaddr0 > [ ]+[0-9a-f]+:[ ]+3b059073[ ]+csrw[ ]+pmpaddr0,a1 > [ ]+[0-9a-f]+:[ ]+3b102573[ ]+csrr[ ]+a0,pmpaddr1 > @@ -249,6 +291,102 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+3be59073[ ]+csrw[ ]+pmpaddr14,a1 > [ ]+[0-9a-f]+:[ ]+3bf02573[ ]+csrr[ ]+a0,pmpaddr15 > [ ]+[0-9a-f]+:[ ]+3bf59073[ ]+csrw[ ]+pmpaddr15,a1 > +[ ]+[0-9a-f]+:[ ]+3c002573[ ]+csrr[ ]+a0,0x3c0 > +[ ]+[0-9a-f]+:[ ]+3c059073[ ]+csrw[ ]+0x3c0,a1 > +[ ]+[0-9a-f]+:[ ]+3c102573[ ]+csrr[ ]+a0,0x3c1 > +[ ]+[0-9a-f]+:[ ]+3c159073[ ]+csrw[ ]+0x3c1,a1 > +[ ]+[0-9a-f]+:[ ]+3c202573[ ]+csrr[ ]+a0,0x3c2 > +[ ]+[0-9a-f]+:[ ]+3c259073[ ]+csrw[ ]+0x3c2,a1 > +[ ]+[0-9a-f]+:[ ]+3c302573[ ]+csrr[ ]+a0,0x3c3 > +[ ]+[0-9a-f]+:[ ]+3c359073[ ]+csrw[ ]+0x3c3,a1 > +[ ]+[0-9a-f]+:[ ]+3c402573[ ]+csrr[ ]+a0,0x3c4 > +[ ]+[0-9a-f]+:[ ]+3c459073[ ]+csrw[ ]+0x3c4,a1 > +[ ]+[0-9a-f]+:[ ]+3c502573[ ]+csrr[ ]+a0,0x3c5 > +[ ]+[0-9a-f]+:[ ]+3c559073[ ]+csrw[ ]+0x3c5,a1 > +[ ]+[0-9a-f]+:[ ]+3c602573[ ]+csrr[ ]+a0,0x3c6 > +[ ]+[0-9a-f]+:[ ]+3c659073[ ]+csrw[ ]+0x3c6,a1 > +[ ]+[0-9a-f]+:[ ]+3c702573[ ]+csrr[ ]+a0,0x3c7 > +[ ]+[0-9a-f]+:[ ]+3c759073[ ]+csrw[ ]+0x3c7,a1 > +[ ]+[0-9a-f]+:[ ]+3c802573[ ]+csrr[ ]+a0,0x3c8 > +[ ]+[0-9a-f]+:[ ]+3c859073[ ]+csrw[ ]+0x3c8,a1 > +[ ]+[0-9a-f]+:[ ]+3c902573[ ]+csrr[ ]+a0,0x3c9 > +[ ]+[0-9a-f]+:[ ]+3c959073[ ]+csrw[ ]+0x3c9,a1 > +[ ]+[0-9a-f]+:[ ]+3ca02573[ ]+csrr[ ]+a0,0x3ca > +[ ]+[0-9a-f]+:[ ]+3ca59073[ ]+csrw[ ]+0x3ca,a1 > +[ ]+[0-9a-f]+:[ ]+3cb02573[ ]+csrr[ ]+a0,0x3cb > +[ ]+[0-9a-f]+:[ ]+3cb59073[ ]+csrw[ ]+0x3cb,a1 > +[ ]+[0-9a-f]+:[ ]+3cc02573[ ]+csrr[ ]+a0,0x3cc > +[ ]+[0-9a-f]+:[ ]+3cc59073[ ]+csrw[ ]+0x3cc,a1 > +[ ]+[0-9a-f]+:[ ]+3cd02573[ ]+csrr[ ]+a0,0x3cd > +[ ]+[0-9a-f]+:[ ]+3cd59073[ ]+csrw[ ]+0x3cd,a1 > +[ ]+[0-9a-f]+:[ ]+3ce02573[ ]+csrr[ ]+a0,0x3ce > +[ ]+[0-9a-f]+:[ ]+3ce59073[ ]+csrw[ ]+0x3ce,a1 > +[ ]+[0-9a-f]+:[ ]+3cf02573[ ]+csrr[ ]+a0,0x3cf > +[ ]+[0-9a-f]+:[ ]+3cf59073[ ]+csrw[ ]+0x3cf,a1 > +[ ]+[0-9a-f]+:[ ]+3d002573[ ]+csrr[ ]+a0,0x3d0 > +[ ]+[0-9a-f]+:[ ]+3d059073[ ]+csrw[ ]+0x3d0,a1 > +[ ]+[0-9a-f]+:[ ]+3d102573[ ]+csrr[ ]+a0,0x3d1 > +[ ]+[0-9a-f]+:[ ]+3d159073[ ]+csrw[ ]+0x3d1,a1 > +[ ]+[0-9a-f]+:[ ]+3d202573[ ]+csrr[ ]+a0,0x3d2 > +[ ]+[0-9a-f]+:[ ]+3d259073[ ]+csrw[ ]+0x3d2,a1 > +[ ]+[0-9a-f]+:[ ]+3d302573[ ]+csrr[ ]+a0,0x3d3 > +[ ]+[0-9a-f]+:[ ]+3d359073[ ]+csrw[ ]+0x3d3,a1 > +[ ]+[0-9a-f]+:[ ]+3d402573[ ]+csrr[ ]+a0,0x3d4 > +[ ]+[0-9a-f]+:[ ]+3d459073[ ]+csrw[ ]+0x3d4,a1 > +[ ]+[0-9a-f]+:[ ]+3d502573[ ]+csrr[ ]+a0,0x3d5 > +[ ]+[0-9a-f]+:[ ]+3d559073[ ]+csrw[ ]+0x3d5,a1 > +[ ]+[0-9a-f]+:[ ]+3d602573[ ]+csrr[ ]+a0,0x3d6 > +[ ]+[0-9a-f]+:[ ]+3d659073[ ]+csrw[ ]+0x3d6,a1 > +[ ]+[0-9a-f]+:[ ]+3d702573[ ]+csrr[ ]+a0,0x3d7 > +[ ]+[0-9a-f]+:[ ]+3d759073[ ]+csrw[ ]+0x3d7,a1 > +[ ]+[0-9a-f]+:[ ]+3d802573[ ]+csrr[ ]+a0,0x3d8 > +[ ]+[0-9a-f]+:[ ]+3d859073[ ]+csrw[ ]+0x3d8,a1 > +[ ]+[0-9a-f]+:[ ]+3d902573[ ]+csrr[ ]+a0,0x3d9 > +[ ]+[0-9a-f]+:[ ]+3d959073[ ]+csrw[ ]+0x3d9,a1 > +[ ]+[0-9a-f]+:[ ]+3da02573[ ]+csrr[ ]+a0,0x3da > +[ ]+[0-9a-f]+:[ ]+3da59073[ ]+csrw[ ]+0x3da,a1 > +[ ]+[0-9a-f]+:[ ]+3db02573[ ]+csrr[ ]+a0,0x3db > +[ ]+[0-9a-f]+:[ ]+3db59073[ ]+csrw[ ]+0x3db,a1 > +[ ]+[0-9a-f]+:[ ]+3dc02573[ ]+csrr[ ]+a0,0x3dc > +[ ]+[0-9a-f]+:[ ]+3dc59073[ ]+csrw[ ]+0x3dc,a1 > +[ ]+[0-9a-f]+:[ ]+3dd02573[ ]+csrr[ ]+a0,0x3dd > +[ ]+[0-9a-f]+:[ ]+3dd59073[ ]+csrw[ ]+0x3dd,a1 > +[ ]+[0-9a-f]+:[ ]+3de02573[ ]+csrr[ ]+a0,0x3de > +[ ]+[0-9a-f]+:[ ]+3de59073[ ]+csrw[ ]+0x3de,a1 > +[ ]+[0-9a-f]+:[ ]+3df02573[ ]+csrr[ ]+a0,0x3df > +[ ]+[0-9a-f]+:[ ]+3df59073[ ]+csrw[ ]+0x3df,a1 > +[ ]+[0-9a-f]+:[ ]+3e002573[ ]+csrr[ ]+a0,0x3e0 > +[ ]+[0-9a-f]+:[ ]+3e059073[ ]+csrw[ ]+0x3e0,a1 > +[ ]+[0-9a-f]+:[ ]+3e102573[ ]+csrr[ ]+a0,0x3e1 > +[ ]+[0-9a-f]+:[ ]+3e159073[ ]+csrw[ ]+0x3e1,a1 > +[ ]+[0-9a-f]+:[ ]+3e202573[ ]+csrr[ ]+a0,0x3e2 > +[ ]+[0-9a-f]+:[ ]+3e259073[ ]+csrw[ ]+0x3e2,a1 > +[ ]+[0-9a-f]+:[ ]+3e302573[ ]+csrr[ ]+a0,0x3e3 > +[ ]+[0-9a-f]+:[ ]+3e359073[ ]+csrw[ ]+0x3e3,a1 > +[ ]+[0-9a-f]+:[ ]+3e402573[ ]+csrr[ ]+a0,0x3e4 > +[ ]+[0-9a-f]+:[ ]+3e459073[ ]+csrw[ ]+0x3e4,a1 > +[ ]+[0-9a-f]+:[ ]+3e502573[ ]+csrr[ ]+a0,0x3e5 > +[ ]+[0-9a-f]+:[ ]+3e559073[ ]+csrw[ ]+0x3e5,a1 > +[ ]+[0-9a-f]+:[ ]+3e602573[ ]+csrr[ ]+a0,0x3e6 > +[ ]+[0-9a-f]+:[ ]+3e659073[ ]+csrw[ ]+0x3e6,a1 > +[ ]+[0-9a-f]+:[ ]+3e702573[ ]+csrr[ ]+a0,0x3e7 > +[ ]+[0-9a-f]+:[ ]+3e759073[ ]+csrw[ ]+0x3e7,a1 > +[ ]+[0-9a-f]+:[ ]+3e802573[ ]+csrr[ ]+a0,0x3e8 > +[ ]+[0-9a-f]+:[ ]+3e859073[ ]+csrw[ ]+0x3e8,a1 > +[ ]+[0-9a-f]+:[ ]+3e902573[ ]+csrr[ ]+a0,0x3e9 > +[ ]+[0-9a-f]+:[ ]+3e959073[ ]+csrw[ ]+0x3e9,a1 > +[ ]+[0-9a-f]+:[ ]+3ea02573[ ]+csrr[ ]+a0,0x3ea > +[ ]+[0-9a-f]+:[ ]+3ea59073[ ]+csrw[ ]+0x3ea,a1 > +[ ]+[0-9a-f]+:[ ]+3eb02573[ ]+csrr[ ]+a0,0x3eb > +[ ]+[0-9a-f]+:[ ]+3eb59073[ ]+csrw[ ]+0x3eb,a1 > +[ ]+[0-9a-f]+:[ ]+3ec02573[ ]+csrr[ ]+a0,0x3ec > +[ ]+[0-9a-f]+:[ ]+3ec59073[ ]+csrw[ ]+0x3ec,a1 > +[ ]+[0-9a-f]+:[ ]+3ed02573[ ]+csrr[ ]+a0,0x3ed > +[ ]+[0-9a-f]+:[ ]+3ed59073[ ]+csrw[ ]+0x3ed,a1 > +[ ]+[0-9a-f]+:[ ]+3ee02573[ ]+csrr[ ]+a0,0x3ee > +[ ]+[0-9a-f]+:[ ]+3ee59073[ ]+csrw[ ]+0x3ee,a1 > +[ ]+[0-9a-f]+:[ ]+3ef02573[ ]+csrr[ ]+a0,0x3ef > +[ ]+[0-9a-f]+:[ ]+3ef59073[ ]+csrw[ ]+0x3ef,a1 > [ ]+[0-9a-f]+:[ ]+b0002573[ ]+csrr[ ]+a0,mcycle > [ ]+[0-9a-f]+:[ ]+b0059073[ ]+csrw[ ]+mcycle,a1 > [ ]+[0-9a-f]+:[ ]+b0202573[ ]+csrr[ ]+a0,minstret > diff --git a/gas/testsuite/gas/riscv/csr-version-1p10.l b/gas/testsuite/gas/riscv/csr-version-1p10.l > index ed6773e637c..c0cb2d5d279 100644 > --- a/gas/testsuite/gas/riscv/csr-version-1p10.l > +++ b/gas/testsuite/gas/riscv/csr-version-1p10.l > @@ -127,14 +127,171 @@ > .*Warning: invalid CSR `hpmcounter31h' for the current ISA > .*Warning: invalid CSR `hpmcounter31h' for the current ISA > .*Warning: read-only CSR is written `csrw hpmcounter31h,a1' > +.*Warning: invalid CSR `senvcfg' for the privileged spec `1.10' > +.*Warning: invalid CSR `senvcfg' for the privileged spec `1.10' > .*Warning: read-only CSR is written `csrw mvendorid,a1' > .*Warning: read-only CSR is written `csrw marchid,a1' > .*Warning: read-only CSR is written `csrw mimpid,a1' > .*Warning: read-only CSR is written `csrw mhartid,a1' > +.*Warning: invalid CSR `mconfigptr' for the privileged spec `1.10' > +.*Warning: invalid CSR `mconfigptr' for the privileged spec `1.10' > +.*Warning: read-only CSR is written `csrw mconfigptr,a1' > +.*Warning: invalid CSR `menvcfg' for the privileged spec `1.10' > +.*Warning: invalid CSR `menvcfg' for the privileged spec `1.10' > +.*Warning: invalid CSR `mstatush' for the current ISA > +.*Warning: invalid CSR `mstatush' for the privileged spec `1.10' > +.*Warning: invalid CSR `mstatush' for the current ISA > +.*Warning: invalid CSR `mstatush' for the privileged spec `1.10' > +.*Warning: invalid CSR `menvcfgh' for the current ISA > +.*Warning: invalid CSR `menvcfgh' for the privileged spec `1.10' > +.*Warning: invalid CSR `menvcfgh' for the current ISA > +.*Warning: invalid CSR `menvcfgh' for the privileged spec `1.10' > +.*Warning: invalid CSR `mseccfg' for the privileged spec `1.10' > +.*Warning: invalid CSR `mseccfg' for the privileged spec `1.10' > +.*Warning: invalid CSR `mseccfgh' for the current ISA > +.*Warning: invalid CSR `mseccfgh' for the privileged spec `1.10' > +.*Warning: invalid CSR `mseccfgh' for the current ISA > +.*Warning: invalid CSR `mseccfgh' for the privileged spec `1.10' > +.*Warning: invalid CSR `mtinst' for the privileged spec `1.10' > +.*Warning: invalid CSR `mtinst' for the privileged spec `1.10' > +.*Warning: invalid CSR `mtval2' for the privileged spec `1.10' > +.*Warning: invalid CSR `mtval2' for the privileged spec `1.10' > .*Warning: invalid CSR `pmpcfg1' for the current ISA > .*Warning: invalid CSR `pmpcfg1' for the current ISA > .*Warning: invalid CSR `pmpcfg3' for the current ISA > .*Warning: invalid CSR `pmpcfg3' for the current ISA > +.*Warning: invalid CSR `pmpcfg4' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg4' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg5' for the current ISA > +.*Warning: invalid CSR `pmpcfg5' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg5' for the current ISA > +.*Warning: invalid CSR `pmpcfg5' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg6' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg6' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg7' for the current ISA > +.*Warning: invalid CSR `pmpcfg7' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg7' for the current ISA > +.*Warning: invalid CSR `pmpcfg7' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg8' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg8' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg9' for the current ISA > +.*Warning: invalid CSR `pmpcfg9' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg9' for the current ISA > +.*Warning: invalid CSR `pmpcfg9' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg10' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg10' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg11' for the current ISA > +.*Warning: invalid CSR `pmpcfg11' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg11' for the current ISA > +.*Warning: invalid CSR `pmpcfg11' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg12' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg12' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg13' for the current ISA > +.*Warning: invalid CSR `pmpcfg13' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg13' for the current ISA > +.*Warning: invalid CSR `pmpcfg13' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg14' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg14' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg15' for the current ISA > +.*Warning: invalid CSR `pmpcfg15' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpcfg15' for the current ISA > +.*Warning: invalid CSR `pmpcfg15' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr16' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr16' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr17' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr17' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr18' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr18' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr19' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr19' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr20' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr20' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr21' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr21' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr22' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr22' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr23' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr23' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr24' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr24' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr25' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr25' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr26' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr26' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr27' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr27' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr28' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr28' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr29' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr29' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr30' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr30' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr31' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr31' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr32' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr32' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr33' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr33' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr34' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr34' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr35' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr35' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr36' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr36' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr37' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr37' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr38' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr38' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr39' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr39' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr40' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr40' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr41' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr41' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr42' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr42' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr43' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr43' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr44' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr44' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr45' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr45' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr46' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr46' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr47' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr47' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr48' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr48' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr49' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr49' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr50' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr50' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr51' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr51' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr52' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr52' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr53' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr53' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr54' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr54' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr55' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr55' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr56' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr56' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr57' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr57' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr58' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr58' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr59' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr59' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr60' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr60' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr61' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr61' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr62' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr62' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr63' for the privileged spec `1.10' > +.*Warning: invalid CSR `pmpaddr63' for the privileged spec `1.10' > .*Warning: invalid CSR `mcycleh' for the current ISA > .*Warning: invalid CSR `mcycleh' for the current ISA > .*Warning: invalid CSR `minstreth' for the current ISA > diff --git a/gas/testsuite/gas/riscv/csr-version-1p11.d b/gas/testsuite/gas/riscv/csr-version-1p11.d > index b40c1d5d6b9..a8586d96408 100644 > --- a/gas/testsuite/gas/riscv/csr-version-1p11.d > +++ b/gas/testsuite/gas/riscv/csr-version-1p11.d > @@ -165,6 +165,8 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+10559073[ ]+csrw[ ]+stvec,a1 > [ ]+[0-9a-f]+:[ ]+10602573[ ]+csrr[ ]+a0,scounteren > [ ]+[0-9a-f]+:[ ]+10659073[ ]+csrw[ ]+scounteren,a1 > +[ ]+[0-9a-f]+:[ ]+10a02573[ ]+csrr[ ]+a0,0x10a > +[ ]+[0-9a-f]+:[ ]+10a59073[ ]+csrw[ ]+0x10a,a1 > [ ]+[0-9a-f]+:[ ]+14002573[ ]+csrr[ ]+a0,sscratch > [ ]+[0-9a-f]+:[ ]+14059073[ ]+csrw[ ]+sscratch,a1 > [ ]+[0-9a-f]+:[ ]+14102573[ ]+csrr[ ]+a0,sepc > @@ -185,6 +187,8 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+f1359073[ ]+csrw[ ]+mimpid,a1 > [ ]+[0-9a-f]+:[ ]+f1402573[ ]+csrr[ ]+a0,mhartid > [ ]+[0-9a-f]+:[ ]+f1459073[ ]+csrw[ ]+mhartid,a1 > +[ ]+[0-9a-f]+:[ ]+f1502573[ ]+csrr[ ]+a0,0xf15 > +[ ]+[0-9a-f]+:[ ]+f1559073[ ]+csrw[ ]+0xf15,a1 > [ ]+[0-9a-f]+:[ ]+30002573[ ]+csrr[ ]+a0,mstatus > [ ]+[0-9a-f]+:[ ]+30059073[ ]+csrw[ ]+mstatus,a1 > [ ]+[0-9a-f]+:[ ]+30102573[ ]+csrr[ ]+a0,misa > @@ -199,6 +203,16 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+30559073[ ]+csrw[ ]+mtvec,a1 > [ ]+[0-9a-f]+:[ ]+30602573[ ]+csrr[ ]+a0,mcounteren > [ ]+[0-9a-f]+:[ ]+30659073[ ]+csrw[ ]+mcounteren,a1 > +[ ]+[0-9a-f]+:[ ]+30a02573[ ]+csrr[ ]+a0,0x30a > +[ ]+[0-9a-f]+:[ ]+30a59073[ ]+csrw[ ]+0x30a,a1 > +[ ]+[0-9a-f]+:[ ]+31002573[ ]+csrr[ ]+a0,0x310 > +[ ]+[0-9a-f]+:[ ]+31059073[ ]+csrw[ ]+0x310,a1 > +[ ]+[0-9a-f]+:[ ]+31a02573[ ]+csrr[ ]+a0,0x31a > +[ ]+[0-9a-f]+:[ ]+31a59073[ ]+csrw[ ]+0x31a,a1 > +[ ]+[0-9a-f]+:[ ]+74702573[ ]+csrr[ ]+a0,0x747 > +[ ]+[0-9a-f]+:[ ]+74759073[ ]+csrw[ ]+0x747,a1 > +[ ]+[0-9a-f]+:[ ]+75702573[ ]+csrr[ ]+a0,0x757 > +[ ]+[0-9a-f]+:[ ]+75759073[ ]+csrw[ ]+0x757,a1 > [ ]+[0-9a-f]+:[ ]+34002573[ ]+csrr[ ]+a0,mscratch > [ ]+[0-9a-f]+:[ ]+34059073[ ]+csrw[ ]+mscratch,a1 > [ ]+[0-9a-f]+:[ ]+34102573[ ]+csrr[ ]+a0,mepc > @@ -209,6 +223,10 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+34359073[ ]+csrw[ ]+mtval,a1 > [ ]+[0-9a-f]+:[ ]+34402573[ ]+csrr[ ]+a0,mip > [ ]+[0-9a-f]+:[ ]+34459073[ ]+csrw[ ]+mip,a1 > +[ ]+[0-9a-f]+:[ ]+34a02573[ ]+csrr[ ]+a0,0x34a > +[ ]+[0-9a-f]+:[ ]+34a59073[ ]+csrw[ ]+0x34a,a1 > +[ ]+[0-9a-f]+:[ ]+34b02573[ ]+csrr[ ]+a0,0x34b > +[ ]+[0-9a-f]+:[ ]+34b59073[ ]+csrw[ ]+0x34b,a1 > [ ]+[0-9a-f]+:[ ]+3a002573[ ]+csrr[ ]+a0,pmpcfg0 > [ ]+[0-9a-f]+:[ ]+3a059073[ ]+csrw[ ]+pmpcfg0,a1 > [ ]+[0-9a-f]+:[ ]+3a102573[ ]+csrr[ ]+a0,pmpcfg1 > @@ -217,6 +235,30 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+3a259073[ ]+csrw[ ]+pmpcfg2,a1 > [ ]+[0-9a-f]+:[ ]+3a302573[ ]+csrr[ ]+a0,pmpcfg3 > [ ]+[0-9a-f]+:[ ]+3a359073[ ]+csrw[ ]+pmpcfg3,a1 > +[ ]+[0-9a-f]+:[ ]+3a402573[ ]+csrr[ ]+a0,0x3a4 > +[ ]+[0-9a-f]+:[ ]+3a459073[ ]+csrw[ ]+0x3a4,a1 > +[ ]+[0-9a-f]+:[ ]+3a502573[ ]+csrr[ ]+a0,0x3a5 > +[ ]+[0-9a-f]+:[ ]+3a559073[ ]+csrw[ ]+0x3a5,a1 > +[ ]+[0-9a-f]+:[ ]+3a602573[ ]+csrr[ ]+a0,0x3a6 > +[ ]+[0-9a-f]+:[ ]+3a659073[ ]+csrw[ ]+0x3a6,a1 > +[ ]+[0-9a-f]+:[ ]+3a702573[ ]+csrr[ ]+a0,0x3a7 > +[ ]+[0-9a-f]+:[ ]+3a759073[ ]+csrw[ ]+0x3a7,a1 > +[ ]+[0-9a-f]+:[ ]+3a802573[ ]+csrr[ ]+a0,0x3a8 > +[ ]+[0-9a-f]+:[ ]+3a859073[ ]+csrw[ ]+0x3a8,a1 > +[ ]+[0-9a-f]+:[ ]+3a902573[ ]+csrr[ ]+a0,0x3a9 > +[ ]+[0-9a-f]+:[ ]+3a959073[ ]+csrw[ ]+0x3a9,a1 > +[ ]+[0-9a-f]+:[ ]+3aa02573[ ]+csrr[ ]+a0,0x3aa > +[ ]+[0-9a-f]+:[ ]+3aa59073[ ]+csrw[ ]+0x3aa,a1 > +[ ]+[0-9a-f]+:[ ]+3ab02573[ ]+csrr[ ]+a0,0x3ab > +[ ]+[0-9a-f]+:[ ]+3ab59073[ ]+csrw[ ]+0x3ab,a1 > +[ ]+[0-9a-f]+:[ ]+3ac02573[ ]+csrr[ ]+a0,0x3ac > +[ ]+[0-9a-f]+:[ ]+3ac59073[ ]+csrw[ ]+0x3ac,a1 > +[ ]+[0-9a-f]+:[ ]+3ad02573[ ]+csrr[ ]+a0,0x3ad > +[ ]+[0-9a-f]+:[ ]+3ad59073[ ]+csrw[ ]+0x3ad,a1 > +[ ]+[0-9a-f]+:[ ]+3ae02573[ ]+csrr[ ]+a0,0x3ae > +[ ]+[0-9a-f]+:[ ]+3ae59073[ ]+csrw[ ]+0x3ae,a1 > +[ ]+[0-9a-f]+:[ ]+3af02573[ ]+csrr[ ]+a0,0x3af > +[ ]+[0-9a-f]+:[ ]+3af59073[ ]+csrw[ ]+0x3af,a1 > [ ]+[0-9a-f]+:[ ]+3b002573[ ]+csrr[ ]+a0,pmpaddr0 > [ ]+[0-9a-f]+:[ ]+3b059073[ ]+csrw[ ]+pmpaddr0,a1 > [ ]+[0-9a-f]+:[ ]+3b102573[ ]+csrr[ ]+a0,pmpaddr1 > @@ -249,6 +291,102 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+3be59073[ ]+csrw[ ]+pmpaddr14,a1 > [ ]+[0-9a-f]+:[ ]+3bf02573[ ]+csrr[ ]+a0,pmpaddr15 > [ ]+[0-9a-f]+:[ ]+3bf59073[ ]+csrw[ ]+pmpaddr15,a1 > +[ ]+[0-9a-f]+:[ ]+3c002573[ ]+csrr[ ]+a0,0x3c0 > +[ ]+[0-9a-f]+:[ ]+3c059073[ ]+csrw[ ]+0x3c0,a1 > +[ ]+[0-9a-f]+:[ ]+3c102573[ ]+csrr[ ]+a0,0x3c1 > +[ ]+[0-9a-f]+:[ ]+3c159073[ ]+csrw[ ]+0x3c1,a1 > +[ ]+[0-9a-f]+:[ ]+3c202573[ ]+csrr[ ]+a0,0x3c2 > +[ ]+[0-9a-f]+:[ ]+3c259073[ ]+csrw[ ]+0x3c2,a1 > +[ ]+[0-9a-f]+:[ ]+3c302573[ ]+csrr[ ]+a0,0x3c3 > +[ ]+[0-9a-f]+:[ ]+3c359073[ ]+csrw[ ]+0x3c3,a1 > +[ ]+[0-9a-f]+:[ ]+3c402573[ ]+csrr[ ]+a0,0x3c4 > +[ ]+[0-9a-f]+:[ ]+3c459073[ ]+csrw[ ]+0x3c4,a1 > +[ ]+[0-9a-f]+:[ ]+3c502573[ ]+csrr[ ]+a0,0x3c5 > +[ ]+[0-9a-f]+:[ ]+3c559073[ ]+csrw[ ]+0x3c5,a1 > +[ ]+[0-9a-f]+:[ ]+3c602573[ ]+csrr[ ]+a0,0x3c6 > +[ ]+[0-9a-f]+:[ ]+3c659073[ ]+csrw[ ]+0x3c6,a1 > +[ ]+[0-9a-f]+:[ ]+3c702573[ ]+csrr[ ]+a0,0x3c7 > +[ ]+[0-9a-f]+:[ ]+3c759073[ ]+csrw[ ]+0x3c7,a1 > +[ ]+[0-9a-f]+:[ ]+3c802573[ ]+csrr[ ]+a0,0x3c8 > +[ ]+[0-9a-f]+:[ ]+3c859073[ ]+csrw[ ]+0x3c8,a1 > +[ ]+[0-9a-f]+:[ ]+3c902573[ ]+csrr[ ]+a0,0x3c9 > +[ ]+[0-9a-f]+:[ ]+3c959073[ ]+csrw[ ]+0x3c9,a1 > +[ ]+[0-9a-f]+:[ ]+3ca02573[ ]+csrr[ ]+a0,0x3ca > +[ ]+[0-9a-f]+:[ ]+3ca59073[ ]+csrw[ ]+0x3ca,a1 > +[ ]+[0-9a-f]+:[ ]+3cb02573[ ]+csrr[ ]+a0,0x3cb > +[ ]+[0-9a-f]+:[ ]+3cb59073[ ]+csrw[ ]+0x3cb,a1 > +[ ]+[0-9a-f]+:[ ]+3cc02573[ ]+csrr[ ]+a0,0x3cc > +[ ]+[0-9a-f]+:[ ]+3cc59073[ ]+csrw[ ]+0x3cc,a1 > +[ ]+[0-9a-f]+:[ ]+3cd02573[ ]+csrr[ ]+a0,0x3cd > +[ ]+[0-9a-f]+:[ ]+3cd59073[ ]+csrw[ ]+0x3cd,a1 > +[ ]+[0-9a-f]+:[ ]+3ce02573[ ]+csrr[ ]+a0,0x3ce > +[ ]+[0-9a-f]+:[ ]+3ce59073[ ]+csrw[ ]+0x3ce,a1 > +[ ]+[0-9a-f]+:[ ]+3cf02573[ ]+csrr[ ]+a0,0x3cf > +[ ]+[0-9a-f]+:[ ]+3cf59073[ ]+csrw[ ]+0x3cf,a1 > +[ ]+[0-9a-f]+:[ ]+3d002573[ ]+csrr[ ]+a0,0x3d0 > +[ ]+[0-9a-f]+:[ ]+3d059073[ ]+csrw[ ]+0x3d0,a1 > +[ ]+[0-9a-f]+:[ ]+3d102573[ ]+csrr[ ]+a0,0x3d1 > +[ ]+[0-9a-f]+:[ ]+3d159073[ ]+csrw[ ]+0x3d1,a1 > +[ ]+[0-9a-f]+:[ ]+3d202573[ ]+csrr[ ]+a0,0x3d2 > +[ ]+[0-9a-f]+:[ ]+3d259073[ ]+csrw[ ]+0x3d2,a1 > +[ ]+[0-9a-f]+:[ ]+3d302573[ ]+csrr[ ]+a0,0x3d3 > +[ ]+[0-9a-f]+:[ ]+3d359073[ ]+csrw[ ]+0x3d3,a1 > +[ ]+[0-9a-f]+:[ ]+3d402573[ ]+csrr[ ]+a0,0x3d4 > +[ ]+[0-9a-f]+:[ ]+3d459073[ ]+csrw[ ]+0x3d4,a1 > +[ ]+[0-9a-f]+:[ ]+3d502573[ ]+csrr[ ]+a0,0x3d5 > +[ ]+[0-9a-f]+:[ ]+3d559073[ ]+csrw[ ]+0x3d5,a1 > +[ ]+[0-9a-f]+:[ ]+3d602573[ ]+csrr[ ]+a0,0x3d6 > +[ ]+[0-9a-f]+:[ ]+3d659073[ ]+csrw[ ]+0x3d6,a1 > +[ ]+[0-9a-f]+:[ ]+3d702573[ ]+csrr[ ]+a0,0x3d7 > +[ ]+[0-9a-f]+:[ ]+3d759073[ ]+csrw[ ]+0x3d7,a1 > +[ ]+[0-9a-f]+:[ ]+3d802573[ ]+csrr[ ]+a0,0x3d8 > +[ ]+[0-9a-f]+:[ ]+3d859073[ ]+csrw[ ]+0x3d8,a1 > +[ ]+[0-9a-f]+:[ ]+3d902573[ ]+csrr[ ]+a0,0x3d9 > +[ ]+[0-9a-f]+:[ ]+3d959073[ ]+csrw[ ]+0x3d9,a1 > +[ ]+[0-9a-f]+:[ ]+3da02573[ ]+csrr[ ]+a0,0x3da > +[ ]+[0-9a-f]+:[ ]+3da59073[ ]+csrw[ ]+0x3da,a1 > +[ ]+[0-9a-f]+:[ ]+3db02573[ ]+csrr[ ]+a0,0x3db > +[ ]+[0-9a-f]+:[ ]+3db59073[ ]+csrw[ ]+0x3db,a1 > +[ ]+[0-9a-f]+:[ ]+3dc02573[ ]+csrr[ ]+a0,0x3dc > +[ ]+[0-9a-f]+:[ ]+3dc59073[ ]+csrw[ ]+0x3dc,a1 > +[ ]+[0-9a-f]+:[ ]+3dd02573[ ]+csrr[ ]+a0,0x3dd > +[ ]+[0-9a-f]+:[ ]+3dd59073[ ]+csrw[ ]+0x3dd,a1 > +[ ]+[0-9a-f]+:[ ]+3de02573[ ]+csrr[ ]+a0,0x3de > +[ ]+[0-9a-f]+:[ ]+3de59073[ ]+csrw[ ]+0x3de,a1 > +[ ]+[0-9a-f]+:[ ]+3df02573[ ]+csrr[ ]+a0,0x3df > +[ ]+[0-9a-f]+:[ ]+3df59073[ ]+csrw[ ]+0x3df,a1 > +[ ]+[0-9a-f]+:[ ]+3e002573[ ]+csrr[ ]+a0,0x3e0 > +[ ]+[0-9a-f]+:[ ]+3e059073[ ]+csrw[ ]+0x3e0,a1 > +[ ]+[0-9a-f]+:[ ]+3e102573[ ]+csrr[ ]+a0,0x3e1 > +[ ]+[0-9a-f]+:[ ]+3e159073[ ]+csrw[ ]+0x3e1,a1 > +[ ]+[0-9a-f]+:[ ]+3e202573[ ]+csrr[ ]+a0,0x3e2 > +[ ]+[0-9a-f]+:[ ]+3e259073[ ]+csrw[ ]+0x3e2,a1 > +[ ]+[0-9a-f]+:[ ]+3e302573[ ]+csrr[ ]+a0,0x3e3 > +[ ]+[0-9a-f]+:[ ]+3e359073[ ]+csrw[ ]+0x3e3,a1 > +[ ]+[0-9a-f]+:[ ]+3e402573[ ]+csrr[ ]+a0,0x3e4 > +[ ]+[0-9a-f]+:[ ]+3e459073[ ]+csrw[ ]+0x3e4,a1 > +[ ]+[0-9a-f]+:[ ]+3e502573[ ]+csrr[ ]+a0,0x3e5 > +[ ]+[0-9a-f]+:[ ]+3e559073[ ]+csrw[ ]+0x3e5,a1 > +[ ]+[0-9a-f]+:[ ]+3e602573[ ]+csrr[ ]+a0,0x3e6 > +[ ]+[0-9a-f]+:[ ]+3e659073[ ]+csrw[ ]+0x3e6,a1 > +[ ]+[0-9a-f]+:[ ]+3e702573[ ]+csrr[ ]+a0,0x3e7 > +[ ]+[0-9a-f]+:[ ]+3e759073[ ]+csrw[ ]+0x3e7,a1 > +[ ]+[0-9a-f]+:[ ]+3e802573[ ]+csrr[ ]+a0,0x3e8 > +[ ]+[0-9a-f]+:[ ]+3e859073[ ]+csrw[ ]+0x3e8,a1 > +[ ]+[0-9a-f]+:[ ]+3e902573[ ]+csrr[ ]+a0,0x3e9 > +[ ]+[0-9a-f]+:[ ]+3e959073[ ]+csrw[ ]+0x3e9,a1 > +[ ]+[0-9a-f]+:[ ]+3ea02573[ ]+csrr[ ]+a0,0x3ea > +[ ]+[0-9a-f]+:[ ]+3ea59073[ ]+csrw[ ]+0x3ea,a1 > +[ ]+[0-9a-f]+:[ ]+3eb02573[ ]+csrr[ ]+a0,0x3eb > +[ ]+[0-9a-f]+:[ ]+3eb59073[ ]+csrw[ ]+0x3eb,a1 > +[ ]+[0-9a-f]+:[ ]+3ec02573[ ]+csrr[ ]+a0,0x3ec > +[ ]+[0-9a-f]+:[ ]+3ec59073[ ]+csrw[ ]+0x3ec,a1 > +[ ]+[0-9a-f]+:[ ]+3ed02573[ ]+csrr[ ]+a0,0x3ed > +[ ]+[0-9a-f]+:[ ]+3ed59073[ ]+csrw[ ]+0x3ed,a1 > +[ ]+[0-9a-f]+:[ ]+3ee02573[ ]+csrr[ ]+a0,0x3ee > +[ ]+[0-9a-f]+:[ ]+3ee59073[ ]+csrw[ ]+0x3ee,a1 > +[ ]+[0-9a-f]+:[ ]+3ef02573[ ]+csrr[ ]+a0,0x3ef > +[ ]+[0-9a-f]+:[ ]+3ef59073[ ]+csrw[ ]+0x3ef,a1 > [ ]+[0-9a-f]+:[ ]+b0002573[ ]+csrr[ ]+a0,mcycle > [ ]+[0-9a-f]+:[ ]+b0059073[ ]+csrw[ ]+mcycle,a1 > [ ]+[0-9a-f]+:[ ]+b0202573[ ]+csrr[ ]+a0,minstret > diff --git a/gas/testsuite/gas/riscv/csr-version-1p11.l b/gas/testsuite/gas/riscv/csr-version-1p11.l > index 44d9611fe49..36ca02a2b1f 100644 > --- a/gas/testsuite/gas/riscv/csr-version-1p11.l > +++ b/gas/testsuite/gas/riscv/csr-version-1p11.l > @@ -127,14 +127,171 @@ > .*Warning: invalid CSR `hpmcounter31h' for the current ISA > .*Warning: invalid CSR `hpmcounter31h' for the current ISA > .*Warning: read-only CSR is written `csrw hpmcounter31h,a1' > +.*Warning: invalid CSR `senvcfg' for the privileged spec `1.11' > +.*Warning: invalid CSR `senvcfg' for the privileged spec `1.11' > .*Warning: read-only CSR is written `csrw mvendorid,a1' > .*Warning: read-only CSR is written `csrw marchid,a1' > .*Warning: read-only CSR is written `csrw mimpid,a1' > .*Warning: read-only CSR is written `csrw mhartid,a1' > +.*Warning: invalid CSR `mconfigptr' for the privileged spec `1.11' > +.*Warning: invalid CSR `mconfigptr' for the privileged spec `1.11' > +.*Warning: read-only CSR is written `csrw mconfigptr,a1' > +.*Warning: invalid CSR `menvcfg' for the privileged spec `1.11' > +.*Warning: invalid CSR `menvcfg' for the privileged spec `1.11' > +.*Warning: invalid CSR `mstatush' for the current ISA > +.*Warning: invalid CSR `mstatush' for the privileged spec `1.11' > +.*Warning: invalid CSR `mstatush' for the current ISA > +.*Warning: invalid CSR `mstatush' for the privileged spec `1.11' > +.*Warning: invalid CSR `menvcfgh' for the current ISA > +.*Warning: invalid CSR `menvcfgh' for the privileged spec `1.11' > +.*Warning: invalid CSR `menvcfgh' for the current ISA > +.*Warning: invalid CSR `menvcfgh' for the privileged spec `1.11' > +.*Warning: invalid CSR `mseccfg' for the privileged spec `1.11' > +.*Warning: invalid CSR `mseccfg' for the privileged spec `1.11' > +.*Warning: invalid CSR `mseccfgh' for the current ISA > +.*Warning: invalid CSR `mseccfgh' for the privileged spec `1.11' > +.*Warning: invalid CSR `mseccfgh' for the current ISA > +.*Warning: invalid CSR `mseccfgh' for the privileged spec `1.11' > +.*Warning: invalid CSR `mtinst' for the privileged spec `1.11' > +.*Warning: invalid CSR `mtinst' for the privileged spec `1.11' > +.*Warning: invalid CSR `mtval2' for the privileged spec `1.11' > +.*Warning: invalid CSR `mtval2' for the privileged spec `1.11' > .*Warning: invalid CSR `pmpcfg1' for the current ISA > .*Warning: invalid CSR `pmpcfg1' for the current ISA > .*Warning: invalid CSR `pmpcfg3' for the current ISA > .*Warning: invalid CSR `pmpcfg3' for the current ISA > +.*Warning: invalid CSR `pmpcfg4' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg4' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg5' for the current ISA > +.*Warning: invalid CSR `pmpcfg5' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg5' for the current ISA > +.*Warning: invalid CSR `pmpcfg5' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg6' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg6' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg7' for the current ISA > +.*Warning: invalid CSR `pmpcfg7' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg7' for the current ISA > +.*Warning: invalid CSR `pmpcfg7' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg8' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg8' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg9' for the current ISA > +.*Warning: invalid CSR `pmpcfg9' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg9' for the current ISA > +.*Warning: invalid CSR `pmpcfg9' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg10' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg10' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg11' for the current ISA > +.*Warning: invalid CSR `pmpcfg11' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg11' for the current ISA > +.*Warning: invalid CSR `pmpcfg11' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg12' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg12' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg13' for the current ISA > +.*Warning: invalid CSR `pmpcfg13' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg13' for the current ISA > +.*Warning: invalid CSR `pmpcfg13' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg14' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg14' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg15' for the current ISA > +.*Warning: invalid CSR `pmpcfg15' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpcfg15' for the current ISA > +.*Warning: invalid CSR `pmpcfg15' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr16' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr16' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr17' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr17' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr18' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr18' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr19' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr19' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr20' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr20' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr21' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr21' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr22' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr22' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr23' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr23' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr24' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr24' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr25' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr25' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr26' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr26' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr27' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr27' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr28' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr28' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr29' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr29' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr30' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr30' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr31' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr31' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr32' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr32' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr33' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr33' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr34' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr34' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr35' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr35' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr36' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr36' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr37' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr37' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr38' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr38' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr39' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr39' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr40' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr40' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr41' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr41' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr42' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr42' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr43' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr43' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr44' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr44' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr45' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr45' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr46' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr46' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr47' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr47' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr48' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr48' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr49' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr49' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr50' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr50' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr51' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr51' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr52' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr52' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr53' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr53' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr54' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr54' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr55' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr55' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr56' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr56' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr57' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr57' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr58' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr58' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr59' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr59' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr60' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr60' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr61' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr61' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr62' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr62' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr63' for the privileged spec `1.11' > +.*Warning: invalid CSR `pmpaddr63' for the privileged spec `1.11' > .*Warning: invalid CSR `mcycleh' for the current ISA > .*Warning: invalid CSR `mcycleh' for the current ISA > .*Warning: invalid CSR `minstreth' for the current ISA > diff --git a/gas/testsuite/gas/riscv/csr-version-1p12.d b/gas/testsuite/gas/riscv/csr-version-1p12.d > index fbc30ee2fcc..8281910b89f 100644 > --- a/gas/testsuite/gas/riscv/csr-version-1p12.d > +++ b/gas/testsuite/gas/riscv/csr-version-1p12.d > @@ -165,6 +165,8 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+10559073[ ]+csrw[ ]+stvec,a1 > [ ]+[0-9a-f]+:[ ]+10602573[ ]+csrr[ ]+a0,scounteren > [ ]+[0-9a-f]+:[ ]+10659073[ ]+csrw[ ]+scounteren,a1 > +[ ]+[0-9a-f]+:[ ]+10a02573[ ]+csrr[ ]+a0,senvcfg > +[ ]+[0-9a-f]+:[ ]+10a59073[ ]+csrw[ ]+senvcfg,a1 > [ ]+[0-9a-f]+:[ ]+14002573[ ]+csrr[ ]+a0,sscratch > [ ]+[0-9a-f]+:[ ]+14059073[ ]+csrw[ ]+sscratch,a1 > [ ]+[0-9a-f]+:[ ]+14102573[ ]+csrr[ ]+a0,sepc > @@ -185,6 +187,8 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+f1359073[ ]+csrw[ ]+mimpid,a1 > [ ]+[0-9a-f]+:[ ]+f1402573[ ]+csrr[ ]+a0,mhartid > [ ]+[0-9a-f]+:[ ]+f1459073[ ]+csrw[ ]+mhartid,a1 > +[ ]+[0-9a-f]+:[ ]+f1502573[ ]+csrr[ ]+a0,mconfigptr > +[ ]+[0-9a-f]+:[ ]+f1559073[ ]+csrw[ ]+mconfigptr,a1 > [ ]+[0-9a-f]+:[ ]+30002573[ ]+csrr[ ]+a0,mstatus > [ ]+[0-9a-f]+:[ ]+30059073[ ]+csrw[ ]+mstatus,a1 > [ ]+[0-9a-f]+:[ ]+30102573[ ]+csrr[ ]+a0,misa > @@ -199,6 +203,16 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+30559073[ ]+csrw[ ]+mtvec,a1 > [ ]+[0-9a-f]+:[ ]+30602573[ ]+csrr[ ]+a0,mcounteren > [ ]+[0-9a-f]+:[ ]+30659073[ ]+csrw[ ]+mcounteren,a1 > +[ ]+[0-9a-f]+:[ ]+30a02573[ ]+csrr[ ]+a0,menvcfg > +[ ]+[0-9a-f]+:[ ]+30a59073[ ]+csrw[ ]+menvcfg,a1 > +[ ]+[0-9a-f]+:[ ]+31002573[ ]+csrr[ ]+a0,mstatush > +[ ]+[0-9a-f]+:[ ]+31059073[ ]+csrw[ ]+mstatush,a1 > +[ ]+[0-9a-f]+:[ ]+31a02573[ ]+csrr[ ]+a0,menvcfgh > +[ ]+[0-9a-f]+:[ ]+31a59073[ ]+csrw[ ]+menvcfgh,a1 > +[ ]+[0-9a-f]+:[ ]+74702573[ ]+csrr[ ]+a0,mseccfg > +[ ]+[0-9a-f]+:[ ]+74759073[ ]+csrw[ ]+mseccfg,a1 > +[ ]+[0-9a-f]+:[ ]+75702573[ ]+csrr[ ]+a0,mseccfgh > +[ ]+[0-9a-f]+:[ ]+75759073[ ]+csrw[ ]+mseccfgh,a1 > [ ]+[0-9a-f]+:[ ]+34002573[ ]+csrr[ ]+a0,mscratch > [ ]+[0-9a-f]+:[ ]+34059073[ ]+csrw[ ]+mscratch,a1 > [ ]+[0-9a-f]+:[ ]+34102573[ ]+csrr[ ]+a0,mepc > @@ -209,6 +223,10 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+34359073[ ]+csrw[ ]+mtval,a1 > [ ]+[0-9a-f]+:[ ]+34402573[ ]+csrr[ ]+a0,mip > [ ]+[0-9a-f]+:[ ]+34459073[ ]+csrw[ ]+mip,a1 > +[ ]+[0-9a-f]+:[ ]+34a02573[ ]+csrr[ ]+a0,mtinst > +[ ]+[0-9a-f]+:[ ]+34a59073[ ]+csrw[ ]+mtinst,a1 > +[ ]+[0-9a-f]+:[ ]+34b02573[ ]+csrr[ ]+a0,mtval2 > +[ ]+[0-9a-f]+:[ ]+34b59073[ ]+csrw[ ]+mtval2,a1 > [ ]+[0-9a-f]+:[ ]+3a002573[ ]+csrr[ ]+a0,pmpcfg0 > [ ]+[0-9a-f]+:[ ]+3a059073[ ]+csrw[ ]+pmpcfg0,a1 > [ ]+[0-9a-f]+:[ ]+3a102573[ ]+csrr[ ]+a0,pmpcfg1 > @@ -217,6 +235,30 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+3a259073[ ]+csrw[ ]+pmpcfg2,a1 > [ ]+[0-9a-f]+:[ ]+3a302573[ ]+csrr[ ]+a0,pmpcfg3 > [ ]+[0-9a-f]+:[ ]+3a359073[ ]+csrw[ ]+pmpcfg3,a1 > +[ ]+[0-9a-f]+:[ ]+3a402573[ ]+csrr[ ]+a0,pmpcfg4 > +[ ]+[0-9a-f]+:[ ]+3a459073[ ]+csrw[ ]+pmpcfg4,a1 > +[ ]+[0-9a-f]+:[ ]+3a502573[ ]+csrr[ ]+a0,pmpcfg5 > +[ ]+[0-9a-f]+:[ ]+3a559073[ ]+csrw[ ]+pmpcfg5,a1 > +[ ]+[0-9a-f]+:[ ]+3a602573[ ]+csrr[ ]+a0,pmpcfg6 > +[ ]+[0-9a-f]+:[ ]+3a659073[ ]+csrw[ ]+pmpcfg6,a1 > +[ ]+[0-9a-f]+:[ ]+3a702573[ ]+csrr[ ]+a0,pmpcfg7 > +[ ]+[0-9a-f]+:[ ]+3a759073[ ]+csrw[ ]+pmpcfg7,a1 > +[ ]+[0-9a-f]+:[ ]+3a802573[ ]+csrr[ ]+a0,pmpcfg8 > +[ ]+[0-9a-f]+:[ ]+3a859073[ ]+csrw[ ]+pmpcfg8,a1 > +[ ]+[0-9a-f]+:[ ]+3a902573[ ]+csrr[ ]+a0,pmpcfg9 > +[ ]+[0-9a-f]+:[ ]+3a959073[ ]+csrw[ ]+pmpcfg9,a1 > +[ ]+[0-9a-f]+:[ ]+3aa02573[ ]+csrr[ ]+a0,pmpcfg10 > +[ ]+[0-9a-f]+:[ ]+3aa59073[ ]+csrw[ ]+pmpcfg10,a1 > +[ ]+[0-9a-f]+:[ ]+3ab02573[ ]+csrr[ ]+a0,pmpcfg11 > +[ ]+[0-9a-f]+:[ ]+3ab59073[ ]+csrw[ ]+pmpcfg11,a1 > +[ ]+[0-9a-f]+:[ ]+3ac02573[ ]+csrr[ ]+a0,pmpcfg12 > +[ ]+[0-9a-f]+:[ ]+3ac59073[ ]+csrw[ ]+pmpcfg12,a1 > +[ ]+[0-9a-f]+:[ ]+3ad02573[ ]+csrr[ ]+a0,pmpcfg13 > +[ ]+[0-9a-f]+:[ ]+3ad59073[ ]+csrw[ ]+pmpcfg13,a1 > +[ ]+[0-9a-f]+:[ ]+3ae02573[ ]+csrr[ ]+a0,pmpcfg14 > +[ ]+[0-9a-f]+:[ ]+3ae59073[ ]+csrw[ ]+pmpcfg14,a1 > +[ ]+[0-9a-f]+:[ ]+3af02573[ ]+csrr[ ]+a0,pmpcfg15 > +[ ]+[0-9a-f]+:[ ]+3af59073[ ]+csrw[ ]+pmpcfg15,a1 > [ ]+[0-9a-f]+:[ ]+3b002573[ ]+csrr[ ]+a0,pmpaddr0 > [ ]+[0-9a-f]+:[ ]+3b059073[ ]+csrw[ ]+pmpaddr0,a1 > [ ]+[0-9a-f]+:[ ]+3b102573[ ]+csrr[ ]+a0,pmpaddr1 > @@ -249,6 +291,102 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+3be59073[ ]+csrw[ ]+pmpaddr14,a1 > [ ]+[0-9a-f]+:[ ]+3bf02573[ ]+csrr[ ]+a0,pmpaddr15 > [ ]+[0-9a-f]+:[ ]+3bf59073[ ]+csrw[ ]+pmpaddr15,a1 > +[ ]+[0-9a-f]+:[ ]+3c002573[ ]+csrr[ ]+a0,pmpaddr16 > +[ ]+[0-9a-f]+:[ ]+3c059073[ ]+csrw[ ]+pmpaddr16,a1 > +[ ]+[0-9a-f]+:[ ]+3c102573[ ]+csrr[ ]+a0,pmpaddr17 > +[ ]+[0-9a-f]+:[ ]+3c159073[ ]+csrw[ ]+pmpaddr17,a1 > +[ ]+[0-9a-f]+:[ ]+3c202573[ ]+csrr[ ]+a0,pmpaddr18 > +[ ]+[0-9a-f]+:[ ]+3c259073[ ]+csrw[ ]+pmpaddr18,a1 > +[ ]+[0-9a-f]+:[ ]+3c302573[ ]+csrr[ ]+a0,pmpaddr19 > +[ ]+[0-9a-f]+:[ ]+3c359073[ ]+csrw[ ]+pmpaddr19,a1 > +[ ]+[0-9a-f]+:[ ]+3c402573[ ]+csrr[ ]+a0,pmpaddr20 > +[ ]+[0-9a-f]+:[ ]+3c459073[ ]+csrw[ ]+pmpaddr20,a1 > +[ ]+[0-9a-f]+:[ ]+3c502573[ ]+csrr[ ]+a0,pmpaddr21 > +[ ]+[0-9a-f]+:[ ]+3c559073[ ]+csrw[ ]+pmpaddr21,a1 > +[ ]+[0-9a-f]+:[ ]+3c602573[ ]+csrr[ ]+a0,pmpaddr22 > +[ ]+[0-9a-f]+:[ ]+3c659073[ ]+csrw[ ]+pmpaddr22,a1 > +[ ]+[0-9a-f]+:[ ]+3c702573[ ]+csrr[ ]+a0,pmpaddr23 > +[ ]+[0-9a-f]+:[ ]+3c759073[ ]+csrw[ ]+pmpaddr23,a1 > +[ ]+[0-9a-f]+:[ ]+3c802573[ ]+csrr[ ]+a0,pmpaddr24 > +[ ]+[0-9a-f]+:[ ]+3c859073[ ]+csrw[ ]+pmpaddr24,a1 > +[ ]+[0-9a-f]+:[ ]+3c902573[ ]+csrr[ ]+a0,pmpaddr25 > +[ ]+[0-9a-f]+:[ ]+3c959073[ ]+csrw[ ]+pmpaddr25,a1 > +[ ]+[0-9a-f]+:[ ]+3ca02573[ ]+csrr[ ]+a0,pmpaddr26 > +[ ]+[0-9a-f]+:[ ]+3ca59073[ ]+csrw[ ]+pmpaddr26,a1 > +[ ]+[0-9a-f]+:[ ]+3cb02573[ ]+csrr[ ]+a0,pmpaddr27 > +[ ]+[0-9a-f]+:[ ]+3cb59073[ ]+csrw[ ]+pmpaddr27,a1 > +[ ]+[0-9a-f]+:[ ]+3cc02573[ ]+csrr[ ]+a0,pmpaddr28 > +[ ]+[0-9a-f]+:[ ]+3cc59073[ ]+csrw[ ]+pmpaddr28,a1 > +[ ]+[0-9a-f]+:[ ]+3cd02573[ ]+csrr[ ]+a0,pmpaddr29 > +[ ]+[0-9a-f]+:[ ]+3cd59073[ ]+csrw[ ]+pmpaddr29,a1 > +[ ]+[0-9a-f]+:[ ]+3ce02573[ ]+csrr[ ]+a0,pmpaddr30 > +[ ]+[0-9a-f]+:[ ]+3ce59073[ ]+csrw[ ]+pmpaddr30,a1 > +[ ]+[0-9a-f]+:[ ]+3cf02573[ ]+csrr[ ]+a0,pmpaddr31 > +[ ]+[0-9a-f]+:[ ]+3cf59073[ ]+csrw[ ]+pmpaddr31,a1 > +[ ]+[0-9a-f]+:[ ]+3d002573[ ]+csrr[ ]+a0,pmpaddr32 > +[ ]+[0-9a-f]+:[ ]+3d059073[ ]+csrw[ ]+pmpaddr32,a1 > +[ ]+[0-9a-f]+:[ ]+3d102573[ ]+csrr[ ]+a0,pmpaddr33 > +[ ]+[0-9a-f]+:[ ]+3d159073[ ]+csrw[ ]+pmpaddr33,a1 > +[ ]+[0-9a-f]+:[ ]+3d202573[ ]+csrr[ ]+a0,pmpaddr34 > +[ ]+[0-9a-f]+:[ ]+3d259073[ ]+csrw[ ]+pmpaddr34,a1 > +[ ]+[0-9a-f]+:[ ]+3d302573[ ]+csrr[ ]+a0,pmpaddr35 > +[ ]+[0-9a-f]+:[ ]+3d359073[ ]+csrw[ ]+pmpaddr35,a1 > +[ ]+[0-9a-f]+:[ ]+3d402573[ ]+csrr[ ]+a0,pmpaddr36 > +[ ]+[0-9a-f]+:[ ]+3d459073[ ]+csrw[ ]+pmpaddr36,a1 > +[ ]+[0-9a-f]+:[ ]+3d502573[ ]+csrr[ ]+a0,pmpaddr37 > +[ ]+[0-9a-f]+:[ ]+3d559073[ ]+csrw[ ]+pmpaddr37,a1 > +[ ]+[0-9a-f]+:[ ]+3d602573[ ]+csrr[ ]+a0,pmpaddr38 > +[ ]+[0-9a-f]+:[ ]+3d659073[ ]+csrw[ ]+pmpaddr38,a1 > +[ ]+[0-9a-f]+:[ ]+3d702573[ ]+csrr[ ]+a0,pmpaddr39 > +[ ]+[0-9a-f]+:[ ]+3d759073[ ]+csrw[ ]+pmpaddr39,a1 > +[ ]+[0-9a-f]+:[ ]+3d802573[ ]+csrr[ ]+a0,pmpaddr40 > +[ ]+[0-9a-f]+:[ ]+3d859073[ ]+csrw[ ]+pmpaddr40,a1 > +[ ]+[0-9a-f]+:[ ]+3d902573[ ]+csrr[ ]+a0,pmpaddr41 > +[ ]+[0-9a-f]+:[ ]+3d959073[ ]+csrw[ ]+pmpaddr41,a1 > +[ ]+[0-9a-f]+:[ ]+3da02573[ ]+csrr[ ]+a0,pmpaddr42 > +[ ]+[0-9a-f]+:[ ]+3da59073[ ]+csrw[ ]+pmpaddr42,a1 > +[ ]+[0-9a-f]+:[ ]+3db02573[ ]+csrr[ ]+a0,pmpaddr43 > +[ ]+[0-9a-f]+:[ ]+3db59073[ ]+csrw[ ]+pmpaddr43,a1 > +[ ]+[0-9a-f]+:[ ]+3dc02573[ ]+csrr[ ]+a0,pmpaddr44 > +[ ]+[0-9a-f]+:[ ]+3dc59073[ ]+csrw[ ]+pmpaddr44,a1 > +[ ]+[0-9a-f]+:[ ]+3dd02573[ ]+csrr[ ]+a0,pmpaddr45 > +[ ]+[0-9a-f]+:[ ]+3dd59073[ ]+csrw[ ]+pmpaddr45,a1 > +[ ]+[0-9a-f]+:[ ]+3de02573[ ]+csrr[ ]+a0,pmpaddr46 > +[ ]+[0-9a-f]+:[ ]+3de59073[ ]+csrw[ ]+pmpaddr46,a1 > +[ ]+[0-9a-f]+:[ ]+3df02573[ ]+csrr[ ]+a0,pmpaddr47 > +[ ]+[0-9a-f]+:[ ]+3df59073[ ]+csrw[ ]+pmpaddr47,a1 > +[ ]+[0-9a-f]+:[ ]+3e002573[ ]+csrr[ ]+a0,pmpaddr48 > +[ ]+[0-9a-f]+:[ ]+3e059073[ ]+csrw[ ]+pmpaddr48,a1 > +[ ]+[0-9a-f]+:[ ]+3e102573[ ]+csrr[ ]+a0,pmpaddr49 > +[ ]+[0-9a-f]+:[ ]+3e159073[ ]+csrw[ ]+pmpaddr49,a1 > +[ ]+[0-9a-f]+:[ ]+3e202573[ ]+csrr[ ]+a0,pmpaddr50 > +[ ]+[0-9a-f]+:[ ]+3e259073[ ]+csrw[ ]+pmpaddr50,a1 > +[ ]+[0-9a-f]+:[ ]+3e302573[ ]+csrr[ ]+a0,pmpaddr51 > +[ ]+[0-9a-f]+:[ ]+3e359073[ ]+csrw[ ]+pmpaddr51,a1 > +[ ]+[0-9a-f]+:[ ]+3e402573[ ]+csrr[ ]+a0,pmpaddr52 > +[ ]+[0-9a-f]+:[ ]+3e459073[ ]+csrw[ ]+pmpaddr52,a1 > +[ ]+[0-9a-f]+:[ ]+3e502573[ ]+csrr[ ]+a0,pmpaddr53 > +[ ]+[0-9a-f]+:[ ]+3e559073[ ]+csrw[ ]+pmpaddr53,a1 > +[ ]+[0-9a-f]+:[ ]+3e602573[ ]+csrr[ ]+a0,pmpaddr54 > +[ ]+[0-9a-f]+:[ ]+3e659073[ ]+csrw[ ]+pmpaddr54,a1 > +[ ]+[0-9a-f]+:[ ]+3e702573[ ]+csrr[ ]+a0,pmpaddr55 > +[ ]+[0-9a-f]+:[ ]+3e759073[ ]+csrw[ ]+pmpaddr55,a1 > +[ ]+[0-9a-f]+:[ ]+3e802573[ ]+csrr[ ]+a0,pmpaddr56 > +[ ]+[0-9a-f]+:[ ]+3e859073[ ]+csrw[ ]+pmpaddr56,a1 > +[ ]+[0-9a-f]+:[ ]+3e902573[ ]+csrr[ ]+a0,pmpaddr57 > +[ ]+[0-9a-f]+:[ ]+3e959073[ ]+csrw[ ]+pmpaddr57,a1 > +[ ]+[0-9a-f]+:[ ]+3ea02573[ ]+csrr[ ]+a0,pmpaddr58 > +[ ]+[0-9a-f]+:[ ]+3ea59073[ ]+csrw[ ]+pmpaddr58,a1 > +[ ]+[0-9a-f]+:[ ]+3eb02573[ ]+csrr[ ]+a0,pmpaddr59 > +[ ]+[0-9a-f]+:[ ]+3eb59073[ ]+csrw[ ]+pmpaddr59,a1 > +[ ]+[0-9a-f]+:[ ]+3ec02573[ ]+csrr[ ]+a0,pmpaddr60 > +[ ]+[0-9a-f]+:[ ]+3ec59073[ ]+csrw[ ]+pmpaddr60,a1 > +[ ]+[0-9a-f]+:[ ]+3ed02573[ ]+csrr[ ]+a0,pmpaddr61 > +[ ]+[0-9a-f]+:[ ]+3ed59073[ ]+csrw[ ]+pmpaddr61,a1 > +[ ]+[0-9a-f]+:[ ]+3ee02573[ ]+csrr[ ]+a0,pmpaddr62 > +[ ]+[0-9a-f]+:[ ]+3ee59073[ ]+csrw[ ]+pmpaddr62,a1 > +[ ]+[0-9a-f]+:[ ]+3ef02573[ ]+csrr[ ]+a0,pmpaddr63 > +[ ]+[0-9a-f]+:[ ]+3ef59073[ ]+csrw[ ]+pmpaddr63,a1 > [ ]+[0-9a-f]+:[ ]+b0002573[ ]+csrr[ ]+a0,mcycle > [ ]+[0-9a-f]+:[ ]+b0059073[ ]+csrw[ ]+mcycle,a1 > [ ]+[0-9a-f]+:[ ]+b0202573[ ]+csrr[ ]+a0,minstret > diff --git a/gas/testsuite/gas/riscv/csr-version-1p12.l b/gas/testsuite/gas/riscv/csr-version-1p12.l > index 237cb8a1699..387c6e2d419 100644 > --- a/gas/testsuite/gas/riscv/csr-version-1p12.l > +++ b/gas/testsuite/gas/riscv/csr-version-1p12.l > @@ -131,10 +131,29 @@ > .*Warning: read-only CSR is written `csrw marchid,a1' > .*Warning: read-only CSR is written `csrw mimpid,a1' > .*Warning: read-only CSR is written `csrw mhartid,a1' > +.*Warning: read-only CSR is written `csrw mconfigptr,a1' > +.*Warning: invalid CSR `mstatush' for the current ISA > +.*Warning: invalid CSR `mstatush' for the current ISA > +.*Warning: invalid CSR `menvcfgh' for the current ISA > +.*Warning: invalid CSR `menvcfgh' for the current ISA > +.*Warning: invalid CSR `mseccfgh' for the current ISA > +.*Warning: invalid CSR `mseccfgh' for the current ISA > .*Warning: invalid CSR `pmpcfg1' for the current ISA > .*Warning: invalid CSR `pmpcfg1' for the current ISA > .*Warning: invalid CSR `pmpcfg3' for the current ISA > .*Warning: invalid CSR `pmpcfg3' for the current ISA > +.*Warning: invalid CSR `pmpcfg5' for the current ISA > +.*Warning: invalid CSR `pmpcfg5' for the current ISA > +.*Warning: invalid CSR `pmpcfg7' for the current ISA > +.*Warning: invalid CSR `pmpcfg7' for the current ISA > +.*Warning: invalid CSR `pmpcfg9' for the current ISA > +.*Warning: invalid CSR `pmpcfg9' for the current ISA > +.*Warning: invalid CSR `pmpcfg11' for the current ISA > +.*Warning: invalid CSR `pmpcfg11' for the current ISA > +.*Warning: invalid CSR `pmpcfg13' for the current ISA > +.*Warning: invalid CSR `pmpcfg13' for the current ISA > +.*Warning: invalid CSR `pmpcfg15' for the current ISA > +.*Warning: invalid CSR `pmpcfg15' for the current ISA > .*Warning: invalid CSR `mcycleh' for the current ISA > .*Warning: invalid CSR `mcycleh' for the current ISA > .*Warning: invalid CSR `minstreth' for the current ISA > diff --git a/gas/testsuite/gas/riscv/csr-version-1p9p1.d b/gas/testsuite/gas/riscv/csr-version-1p9p1.d > index a96e8c9dbec..f5af018e1e1 100644 > --- a/gas/testsuite/gas/riscv/csr-version-1p9p1.d > +++ b/gas/testsuite/gas/riscv/csr-version-1p9p1.d > @@ -165,6 +165,8 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+10559073[ ]+csrw[ ]+stvec,a1 > [ ]+[0-9a-f]+:[ ]+10602573[ ]+csrr[ ]+a0,0x106 > [ ]+[0-9a-f]+:[ ]+10659073[ ]+csrw[ ]+0x106,a1 > +[ ]+[0-9a-f]+:[ ]+10a02573[ ]+csrr[ ]+a0,0x10a > +[ ]+[0-9a-f]+:[ ]+10a59073[ ]+csrw[ ]+0x10a,a1 > [ ]+[0-9a-f]+:[ ]+14002573[ ]+csrr[ ]+a0,sscratch > [ ]+[0-9a-f]+:[ ]+14059073[ ]+csrw[ ]+sscratch,a1 > [ ]+[0-9a-f]+:[ ]+14102573[ ]+csrr[ ]+a0,sepc > @@ -185,6 +187,8 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+f1359073[ ]+csrw[ ]+mimpid,a1 > [ ]+[0-9a-f]+:[ ]+f1402573[ ]+csrr[ ]+a0,mhartid > [ ]+[0-9a-f]+:[ ]+f1459073[ ]+csrw[ ]+mhartid,a1 > +[ ]+[0-9a-f]+:[ ]+f1502573[ ]+csrr[ ]+a0,0xf15 > +[ ]+[0-9a-f]+:[ ]+f1559073[ ]+csrw[ ]+0xf15,a1 > [ ]+[0-9a-f]+:[ ]+30002573[ ]+csrr[ ]+a0,mstatus > [ ]+[0-9a-f]+:[ ]+30059073[ ]+csrw[ ]+mstatus,a1 > [ ]+[0-9a-f]+:[ ]+30102573[ ]+csrr[ ]+a0,misa > @@ -199,6 +203,16 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+30559073[ ]+csrw[ ]+mtvec,a1 > [ ]+[0-9a-f]+:[ ]+30602573[ ]+csrr[ ]+a0,0x306 > [ ]+[0-9a-f]+:[ ]+30659073[ ]+csrw[ ]+0x306,a1 > +[ ]+[0-9a-f]+:[ ]+30a02573[ ]+csrr[ ]+a0,0x30a > +[ ]+[0-9a-f]+:[ ]+30a59073[ ]+csrw[ ]+0x30a,a1 > +[ ]+[0-9a-f]+:[ ]+31002573[ ]+csrr[ ]+a0,0x310 > +[ ]+[0-9a-f]+:[ ]+31059073[ ]+csrw[ ]+0x310,a1 > +[ ]+[0-9a-f]+:[ ]+31a02573[ ]+csrr[ ]+a0,0x31a > +[ ]+[0-9a-f]+:[ ]+31a59073[ ]+csrw[ ]+0x31a,a1 > +[ ]+[0-9a-f]+:[ ]+74702573[ ]+csrr[ ]+a0,0x747 > +[ ]+[0-9a-f]+:[ ]+74759073[ ]+csrw[ ]+0x747,a1 > +[ ]+[0-9a-f]+:[ ]+75702573[ ]+csrr[ ]+a0,0x757 > +[ ]+[0-9a-f]+:[ ]+75759073[ ]+csrw[ ]+0x757,a1 > [ ]+[0-9a-f]+:[ ]+34002573[ ]+csrr[ ]+a0,mscratch > [ ]+[0-9a-f]+:[ ]+34059073[ ]+csrw[ ]+mscratch,a1 > [ ]+[0-9a-f]+:[ ]+34102573[ ]+csrr[ ]+a0,mepc > @@ -209,6 +223,10 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+34359073[ ]+csrw[ ]+mbadaddr,a1 > [ ]+[0-9a-f]+:[ ]+34402573[ ]+csrr[ ]+a0,mip > [ ]+[0-9a-f]+:[ ]+34459073[ ]+csrw[ ]+mip,a1 > +[ ]+[0-9a-f]+:[ ]+34a02573[ ]+csrr[ ]+a0,0x34a > +[ ]+[0-9a-f]+:[ ]+34a59073[ ]+csrw[ ]+0x34a,a1 > +[ ]+[0-9a-f]+:[ ]+34b02573[ ]+csrr[ ]+a0,0x34b > +[ ]+[0-9a-f]+:[ ]+34b59073[ ]+csrw[ ]+0x34b,a1 > [ ]+[0-9a-f]+:[ ]+3a002573[ ]+csrr[ ]+a0,0x3a0 > [ ]+[0-9a-f]+:[ ]+3a059073[ ]+csrw[ ]+0x3a0,a1 > [ ]+[0-9a-f]+:[ ]+3a102573[ ]+csrr[ ]+a0,0x3a1 > @@ -217,6 +235,30 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+3a259073[ ]+csrw[ ]+0x3a2,a1 > [ ]+[0-9a-f]+:[ ]+3a302573[ ]+csrr[ ]+a0,0x3a3 > [ ]+[0-9a-f]+:[ ]+3a359073[ ]+csrw[ ]+0x3a3,a1 > +[ ]+[0-9a-f]+:[ ]+3a402573[ ]+csrr[ ]+a0,0x3a4 > +[ ]+[0-9a-f]+:[ ]+3a459073[ ]+csrw[ ]+0x3a4,a1 > +[ ]+[0-9a-f]+:[ ]+3a502573[ ]+csrr[ ]+a0,0x3a5 > +[ ]+[0-9a-f]+:[ ]+3a559073[ ]+csrw[ ]+0x3a5,a1 > +[ ]+[0-9a-f]+:[ ]+3a602573[ ]+csrr[ ]+a0,0x3a6 > +[ ]+[0-9a-f]+:[ ]+3a659073[ ]+csrw[ ]+0x3a6,a1 > +[ ]+[0-9a-f]+:[ ]+3a702573[ ]+csrr[ ]+a0,0x3a7 > +[ ]+[0-9a-f]+:[ ]+3a759073[ ]+csrw[ ]+0x3a7,a1 > +[ ]+[0-9a-f]+:[ ]+3a802573[ ]+csrr[ ]+a0,0x3a8 > +[ ]+[0-9a-f]+:[ ]+3a859073[ ]+csrw[ ]+0x3a8,a1 > +[ ]+[0-9a-f]+:[ ]+3a902573[ ]+csrr[ ]+a0,0x3a9 > +[ ]+[0-9a-f]+:[ ]+3a959073[ ]+csrw[ ]+0x3a9,a1 > +[ ]+[0-9a-f]+:[ ]+3aa02573[ ]+csrr[ ]+a0,0x3aa > +[ ]+[0-9a-f]+:[ ]+3aa59073[ ]+csrw[ ]+0x3aa,a1 > +[ ]+[0-9a-f]+:[ ]+3ab02573[ ]+csrr[ ]+a0,0x3ab > +[ ]+[0-9a-f]+:[ ]+3ab59073[ ]+csrw[ ]+0x3ab,a1 > +[ ]+[0-9a-f]+:[ ]+3ac02573[ ]+csrr[ ]+a0,0x3ac > +[ ]+[0-9a-f]+:[ ]+3ac59073[ ]+csrw[ ]+0x3ac,a1 > +[ ]+[0-9a-f]+:[ ]+3ad02573[ ]+csrr[ ]+a0,0x3ad > +[ ]+[0-9a-f]+:[ ]+3ad59073[ ]+csrw[ ]+0x3ad,a1 > +[ ]+[0-9a-f]+:[ ]+3ae02573[ ]+csrr[ ]+a0,0x3ae > +[ ]+[0-9a-f]+:[ ]+3ae59073[ ]+csrw[ ]+0x3ae,a1 > +[ ]+[0-9a-f]+:[ ]+3af02573[ ]+csrr[ ]+a0,0x3af > +[ ]+[0-9a-f]+:[ ]+3af59073[ ]+csrw[ ]+0x3af,a1 > [ ]+[0-9a-f]+:[ ]+3b002573[ ]+csrr[ ]+a0,0x3b0 > [ ]+[0-9a-f]+:[ ]+3b059073[ ]+csrw[ ]+0x3b0,a1 > [ ]+[0-9a-f]+:[ ]+3b102573[ ]+csrr[ ]+a0,0x3b1 > @@ -249,6 +291,102 @@ Disassembly of section .text: > [ ]+[0-9a-f]+:[ ]+3be59073[ ]+csrw[ ]+0x3be,a1 > [ ]+[0-9a-f]+:[ ]+3bf02573[ ]+csrr[ ]+a0,0x3bf > [ ]+[0-9a-f]+:[ ]+3bf59073[ ]+csrw[ ]+0x3bf,a1 > +[ ]+[0-9a-f]+:[ ]+3c002573[ ]+csrr[ ]+a0,0x3c0 > +[ ]+[0-9a-f]+:[ ]+3c059073[ ]+csrw[ ]+0x3c0,a1 > +[ ]+[0-9a-f]+:[ ]+3c102573[ ]+csrr[ ]+a0,0x3c1 > +[ ]+[0-9a-f]+:[ ]+3c159073[ ]+csrw[ ]+0x3c1,a1 > +[ ]+[0-9a-f]+:[ ]+3c202573[ ]+csrr[ ]+a0,0x3c2 > +[ ]+[0-9a-f]+:[ ]+3c259073[ ]+csrw[ ]+0x3c2,a1 > +[ ]+[0-9a-f]+:[ ]+3c302573[ ]+csrr[ ]+a0,0x3c3 > +[ ]+[0-9a-f]+:[ ]+3c359073[ ]+csrw[ ]+0x3c3,a1 > +[ ]+[0-9a-f]+:[ ]+3c402573[ ]+csrr[ ]+a0,0x3c4 > +[ ]+[0-9a-f]+:[ ]+3c459073[ ]+csrw[ ]+0x3c4,a1 > +[ ]+[0-9a-f]+:[ ]+3c502573[ ]+csrr[ ]+a0,0x3c5 > +[ ]+[0-9a-f]+:[ ]+3c559073[ ]+csrw[ ]+0x3c5,a1 > +[ ]+[0-9a-f]+:[ ]+3c602573[ ]+csrr[ ]+a0,0x3c6 > +[ ]+[0-9a-f]+:[ ]+3c659073[ ]+csrw[ ]+0x3c6,a1 > +[ ]+[0-9a-f]+:[ ]+3c702573[ ]+csrr[ ]+a0,0x3c7 > +[ ]+[0-9a-f]+:[ ]+3c759073[ ]+csrw[ ]+0x3c7,a1 > +[ ]+[0-9a-f]+:[ ]+3c802573[ ]+csrr[ ]+a0,0x3c8 > +[ ]+[0-9a-f]+:[ ]+3c859073[ ]+csrw[ ]+0x3c8,a1 > +[ ]+[0-9a-f]+:[ ]+3c902573[ ]+csrr[ ]+a0,0x3c9 > +[ ]+[0-9a-f]+:[ ]+3c959073[ ]+csrw[ ]+0x3c9,a1 > +[ ]+[0-9a-f]+:[ ]+3ca02573[ ]+csrr[ ]+a0,0x3ca > +[ ]+[0-9a-f]+:[ ]+3ca59073[ ]+csrw[ ]+0x3ca,a1 > +[ ]+[0-9a-f]+:[ ]+3cb02573[ ]+csrr[ ]+a0,0x3cb > +[ ]+[0-9a-f]+:[ ]+3cb59073[ ]+csrw[ ]+0x3cb,a1 > +[ ]+[0-9a-f]+:[ ]+3cc02573[ ]+csrr[ ]+a0,0x3cc > +[ ]+[0-9a-f]+:[ ]+3cc59073[ ]+csrw[ ]+0x3cc,a1 > +[ ]+[0-9a-f]+:[ ]+3cd02573[ ]+csrr[ ]+a0,0x3cd > +[ ]+[0-9a-f]+:[ ]+3cd59073[ ]+csrw[ ]+0x3cd,a1 > +[ ]+[0-9a-f]+:[ ]+3ce02573[ ]+csrr[ ]+a0,0x3ce > +[ ]+[0-9a-f]+:[ ]+3ce59073[ ]+csrw[ ]+0x3ce,a1 > +[ ]+[0-9a-f]+:[ ]+3cf02573[ ]+csrr[ ]+a0,0x3cf > +[ ]+[0-9a-f]+:[ ]+3cf59073[ ]+csrw[ ]+0x3cf,a1 > +[ ]+[0-9a-f]+:[ ]+3d002573[ ]+csrr[ ]+a0,0x3d0 > +[ ]+[0-9a-f]+:[ ]+3d059073[ ]+csrw[ ]+0x3d0,a1 > +[ ]+[0-9a-f]+:[ ]+3d102573[ ]+csrr[ ]+a0,0x3d1 > +[ ]+[0-9a-f]+:[ ]+3d159073[ ]+csrw[ ]+0x3d1,a1 > +[ ]+[0-9a-f]+:[ ]+3d202573[ ]+csrr[ ]+a0,0x3d2 > +[ ]+[0-9a-f]+:[ ]+3d259073[ ]+csrw[ ]+0x3d2,a1 > +[ ]+[0-9a-f]+:[ ]+3d302573[ ]+csrr[ ]+a0,0x3d3 > +[ ]+[0-9a-f]+:[ ]+3d359073[ ]+csrw[ ]+0x3d3,a1 > +[ ]+[0-9a-f]+:[ ]+3d402573[ ]+csrr[ ]+a0,0x3d4 > +[ ]+[0-9a-f]+:[ ]+3d459073[ ]+csrw[ ]+0x3d4,a1 > +[ ]+[0-9a-f]+:[ ]+3d502573[ ]+csrr[ ]+a0,0x3d5 > +[ ]+[0-9a-f]+:[ ]+3d559073[ ]+csrw[ ]+0x3d5,a1 > +[ ]+[0-9a-f]+:[ ]+3d602573[ ]+csrr[ ]+a0,0x3d6 > +[ ]+[0-9a-f]+:[ ]+3d659073[ ]+csrw[ ]+0x3d6,a1 > +[ ]+[0-9a-f]+:[ ]+3d702573[ ]+csrr[ ]+a0,0x3d7 > +[ ]+[0-9a-f]+:[ ]+3d759073[ ]+csrw[ ]+0x3d7,a1 > +[ ]+[0-9a-f]+:[ ]+3d802573[ ]+csrr[ ]+a0,0x3d8 > +[ ]+[0-9a-f]+:[ ]+3d859073[ ]+csrw[ ]+0x3d8,a1 > +[ ]+[0-9a-f]+:[ ]+3d902573[ ]+csrr[ ]+a0,0x3d9 > +[ ]+[0-9a-f]+:[ ]+3d959073[ ]+csrw[ ]+0x3d9,a1 > +[ ]+[0-9a-f]+:[ ]+3da02573[ ]+csrr[ ]+a0,0x3da > +[ ]+[0-9a-f]+:[ ]+3da59073[ ]+csrw[ ]+0x3da,a1 > +[ ]+[0-9a-f]+:[ ]+3db02573[ ]+csrr[ ]+a0,0x3db > +[ ]+[0-9a-f]+:[ ]+3db59073[ ]+csrw[ ]+0x3db,a1 > +[ ]+[0-9a-f]+:[ ]+3dc02573[ ]+csrr[ ]+a0,0x3dc > +[ ]+[0-9a-f]+:[ ]+3dc59073[ ]+csrw[ ]+0x3dc,a1 > +[ ]+[0-9a-f]+:[ ]+3dd02573[ ]+csrr[ ]+a0,0x3dd > +[ ]+[0-9a-f]+:[ ]+3dd59073[ ]+csrw[ ]+0x3dd,a1 > +[ ]+[0-9a-f]+:[ ]+3de02573[ ]+csrr[ ]+a0,0x3de > +[ ]+[0-9a-f]+:[ ]+3de59073[ ]+csrw[ ]+0x3de,a1 > +[ ]+[0-9a-f]+:[ ]+3df02573[ ]+csrr[ ]+a0,0x3df > +[ ]+[0-9a-f]+:[ ]+3df59073[ ]+csrw[ ]+0x3df,a1 > +[ ]+[0-9a-f]+:[ ]+3e002573[ ]+csrr[ ]+a0,0x3e0 > +[ ]+[0-9a-f]+:[ ]+3e059073[ ]+csrw[ ]+0x3e0,a1 > +[ ]+[0-9a-f]+:[ ]+3e102573[ ]+csrr[ ]+a0,0x3e1 > +[ ]+[0-9a-f]+:[ ]+3e159073[ ]+csrw[ ]+0x3e1,a1 > +[ ]+[0-9a-f]+:[ ]+3e202573[ ]+csrr[ ]+a0,0x3e2 > +[ ]+[0-9a-f]+:[ ]+3e259073[ ]+csrw[ ]+0x3e2,a1 > +[ ]+[0-9a-f]+:[ ]+3e302573[ ]+csrr[ ]+a0,0x3e3 > +[ ]+[0-9a-f]+:[ ]+3e359073[ ]+csrw[ ]+0x3e3,a1 > +[ ]+[0-9a-f]+:[ ]+3e402573[ ]+csrr[ ]+a0,0x3e4 > +[ ]+[0-9a-f]+:[ ]+3e459073[ ]+csrw[ ]+0x3e4,a1 > +[ ]+[0-9a-f]+:[ ]+3e502573[ ]+csrr[ ]+a0,0x3e5 > +[ ]+[0-9a-f]+:[ ]+3e559073[ ]+csrw[ ]+0x3e5,a1 > +[ ]+[0-9a-f]+:[ ]+3e602573[ ]+csrr[ ]+a0,0x3e6 > +[ ]+[0-9a-f]+:[ ]+3e659073[ ]+csrw[ ]+0x3e6,a1 > +[ ]+[0-9a-f]+:[ ]+3e702573[ ]+csrr[ ]+a0,0x3e7 > +[ ]+[0-9a-f]+:[ ]+3e759073[ ]+csrw[ ]+0x3e7,a1 > +[ ]+[0-9a-f]+:[ ]+3e802573[ ]+csrr[ ]+a0,0x3e8 > +[ ]+[0-9a-f]+:[ ]+3e859073[ ]+csrw[ ]+0x3e8,a1 > +[ ]+[0-9a-f]+:[ ]+3e902573[ ]+csrr[ ]+a0,0x3e9 > +[ ]+[0-9a-f]+:[ ]+3e959073[ ]+csrw[ ]+0x3e9,a1 > +[ ]+[0-9a-f]+:[ ]+3ea02573[ ]+csrr[ ]+a0,0x3ea > +[ ]+[0-9a-f]+:[ ]+3ea59073[ ]+csrw[ ]+0x3ea,a1 > +[ ]+[0-9a-f]+:[ ]+3eb02573[ ]+csrr[ ]+a0,0x3eb > +[ ]+[0-9a-f]+:[ ]+3eb59073[ ]+csrw[ ]+0x3eb,a1 > +[ ]+[0-9a-f]+:[ ]+3ec02573[ ]+csrr[ ]+a0,0x3ec > +[ ]+[0-9a-f]+:[ ]+3ec59073[ ]+csrw[ ]+0x3ec,a1 > +[ ]+[0-9a-f]+:[ ]+3ed02573[ ]+csrr[ ]+a0,0x3ed > +[ ]+[0-9a-f]+:[ ]+3ed59073[ ]+csrw[ ]+0x3ed,a1 > +[ ]+[0-9a-f]+:[ ]+3ee02573[ ]+csrr[ ]+a0,0x3ee > +[ ]+[0-9a-f]+:[ ]+3ee59073[ ]+csrw[ ]+0x3ee,a1 > +[ ]+[0-9a-f]+:[ ]+3ef02573[ ]+csrr[ ]+a0,0x3ef > +[ ]+[0-9a-f]+:[ ]+3ef59073[ ]+csrw[ ]+0x3ef,a1 > [ ]+[0-9a-f]+:[ ]+b0002573[ ]+csrr[ ]+a0,mcycle > [ ]+[0-9a-f]+:[ ]+b0059073[ ]+csrw[ ]+mcycle,a1 > [ ]+[0-9a-f]+:[ ]+b0202573[ ]+csrr[ ]+a0,minstret > diff --git a/gas/testsuite/gas/riscv/csr-version-1p9p1.l b/gas/testsuite/gas/riscv/csr-version-1p9p1.l > index 00d46f509de..ca50442bc7a 100644 > --- a/gas/testsuite/gas/riscv/csr-version-1p9p1.l > +++ b/gas/testsuite/gas/riscv/csr-version-1p9p1.l > @@ -131,6 +131,8 @@ > .*Warning: read-only CSR is written `csrw hpmcounter31h,a1' > .*Warning: invalid CSR `scounteren' for the privileged spec `1.9.1' > .*Warning: invalid CSR `scounteren' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `senvcfg' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `senvcfg' for the privileged spec `1.9.1' > .*Warning: invalid CSR `stval' for the privileged spec `1.9.1' > .*Warning: invalid CSR `stval' for the privileged spec `1.9.1' > .*Warning: invalid CSR `satp' for the privileged spec `1.9.1' > @@ -139,10 +141,33 @@ > .*Warning: read-only CSR is written `csrw marchid,a1' > .*Warning: read-only CSR is written `csrw mimpid,a1' > .*Warning: read-only CSR is written `csrw mhartid,a1' > +.*Warning: invalid CSR `mconfigptr' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mconfigptr' for the privileged spec `1.9.1' > +.*Warning: read-only CSR is written `csrw mconfigptr,a1' > .*Warning: invalid CSR `mcounteren' for the privileged spec `1.9.1' > .*Warning: invalid CSR `mcounteren' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `menvcfg' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `menvcfg' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mstatush' for the current ISA > +.*Warning: invalid CSR `mstatush' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mstatush' for the current ISA > +.*Warning: invalid CSR `mstatush' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `menvcfgh' for the current ISA > +.*Warning: invalid CSR `menvcfgh' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `menvcfgh' for the current ISA > +.*Warning: invalid CSR `menvcfgh' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mseccfg' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mseccfg' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mseccfgh' for the current ISA > +.*Warning: invalid CSR `mseccfgh' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mseccfgh' for the current ISA > +.*Warning: invalid CSR `mseccfgh' for the privileged spec `1.9.1' > .*Warning: invalid CSR `mtval' for the privileged spec `1.9.1' > .*Warning: invalid CSR `mtval' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mtinst' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mtinst' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mtval2' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `mtval2' for the privileged spec `1.9.1' > .*Warning: invalid CSR `pmpcfg0' for the privileged spec `1.9.1' > .*Warning: invalid CSR `pmpcfg0' for the privileged spec `1.9.1' > .*Warning: invalid CSR `pmpcfg1' for the current ISA > @@ -155,6 +180,42 @@ > .*Warning: invalid CSR `pmpcfg3' for the privileged spec `1.9.1' > .*Warning: invalid CSR `pmpcfg3' for the current ISA > .*Warning: invalid CSR `pmpcfg3' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg4' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg4' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg5' for the current ISA > +.*Warning: invalid CSR `pmpcfg5' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg5' for the current ISA > +.*Warning: invalid CSR `pmpcfg5' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg6' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg6' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg7' for the current ISA > +.*Warning: invalid CSR `pmpcfg7' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg7' for the current ISA > +.*Warning: invalid CSR `pmpcfg7' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg8' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg8' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg9' for the current ISA > +.*Warning: invalid CSR `pmpcfg9' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg9' for the current ISA > +.*Warning: invalid CSR `pmpcfg9' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg10' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg10' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg11' for the current ISA > +.*Warning: invalid CSR `pmpcfg11' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg11' for the current ISA > +.*Warning: invalid CSR `pmpcfg11' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg12' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg12' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg13' for the current ISA > +.*Warning: invalid CSR `pmpcfg13' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg13' for the current ISA > +.*Warning: invalid CSR `pmpcfg13' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg14' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg14' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg15' for the current ISA > +.*Warning: invalid CSR `pmpcfg15' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpcfg15' for the current ISA > +.*Warning: invalid CSR `pmpcfg15' for the privileged spec `1.9.1' > .*Warning: invalid CSR `pmpaddr0' for the privileged spec `1.9.1' > .*Warning: invalid CSR `pmpaddr0' for the privileged spec `1.9.1' > .*Warning: invalid CSR `pmpaddr1' for the privileged spec `1.9.1' > @@ -187,6 +248,102 @@ > .*Warning: invalid CSR `pmpaddr14' for the privileged spec `1.9.1' > .*Warning: invalid CSR `pmpaddr15' for the privileged spec `1.9.1' > .*Warning: invalid CSR `pmpaddr15' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr16' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr16' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr17' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr17' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr18' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr18' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr19' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr19' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr20' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr20' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr21' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr21' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr22' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr22' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr23' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr23' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr24' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr24' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr25' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr25' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr26' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr26' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr27' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr27' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr28' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr28' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr29' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr29' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr30' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr30' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr31' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr31' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr32' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr32' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr33' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr33' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr34' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr34' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr35' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr35' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr36' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr36' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr37' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr37' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr38' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr38' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr39' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr39' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr40' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr40' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr41' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr41' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr42' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr42' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr43' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr43' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr44' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr44' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr45' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr45' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr46' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr46' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr47' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr47' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr48' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr48' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr49' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr49' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr50' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr50' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr51' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr51' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr52' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr52' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr53' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr53' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr54' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr54' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr55' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr55' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr56' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr56' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr57' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr57' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr58' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr58' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr59' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr59' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr60' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr60' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr61' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr61' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr62' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr62' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr63' for the privileged spec `1.9.1' > +.*Warning: invalid CSR `pmpaddr63' for the privileged spec `1.9.1' > .*Warning: invalid CSR `mcycleh' for the current ISA > .*Warning: invalid CSR `mcycleh' for the current ISA > .*Warning: invalid CSR `minstreth' for the current ISA > diff --git a/gas/testsuite/gas/riscv/csr.s b/gas/testsuite/gas/riscv/csr.s > index 568328d70d9..cbb0e23991b 100644 > --- a/gas/testsuite/gas/riscv/csr.s > +++ b/gas/testsuite/gas/riscv/csr.s > @@ -90,6 +90,7 @@ > csr sie > csr stvec > csr scounteren # Added in 1.10 > + csr senvcfg # Added in 1.12 > > # Supervisor Trap Handling > csr sscratch > @@ -106,6 +107,7 @@ > csr marchid > csr mimpid > csr mhartid > + csr mconfigptr # Added in 1.12 > > # Machine Trap Setup > csr mstatus > @@ -115,6 +117,11 @@ > csr mie > csr mtvec > csr mcounteren # Added in 1.10 > + csr menvcfg # Added in 1.12 > + csr mstatush # Added in 1.12 > + csr menvcfgh # Added in 1.12 > + csr mseccfg # Added in 1.12 > + csr mseccfgh # Added in 1.12 > > # Machine Trap Handling > csr mscratch > @@ -122,12 +129,26 @@ > csr mcause > csr mtval # Added in 1.10 > csr mip > + csr mtinst # Added in 1.12 > + csr mtval2 # Added in 1.12 > > # Machine Memory Protection > csr pmpcfg0 # Added in 1.10 > csr pmpcfg1 # Added in 1.10 > csr pmpcfg2 # Added in 1.10 > csr pmpcfg3 # Added in 1.10 > + csr pmpcfg4 # Added in 1.12 > + csr pmpcfg5 # Added in 1.12 > + csr pmpcfg6 # Added in 1.12 > + csr pmpcfg7 # Added in 1.12 > + csr pmpcfg8 # Added in 1.12 > + csr pmpcfg9 # Added in 1.12 > + csr pmpcfg10 # Added in 1.12 > + csr pmpcfg11 # Added in 1.12 > + csr pmpcfg12 # Added in 1.12 > + csr pmpcfg13 # Added in 1.12 > + csr pmpcfg14 # Added in 1.12 > + csr pmpcfg15 # Added in 1.12 > csr pmpaddr0 # Added in 1.10 > csr pmpaddr1 # Added in 1.10 > csr pmpaddr2 # Added in 1.10 > @@ -144,6 +165,54 @@ > csr pmpaddr13 # Added in 1.10 > csr pmpaddr14 # Added in 1.10 > csr pmpaddr15 # Added in 1.10 > + csr pmpaddr16 # Added in 1.12 > + csr pmpaddr17 # Added in 1.12 > + csr pmpaddr18 # Added in 1.12 > + csr pmpaddr19 # Added in 1.12 > + csr pmpaddr20 # Added in 1.12 > + csr pmpaddr21 # Added in 1.12 > + csr pmpaddr22 # Added in 1.12 > + csr pmpaddr23 # Added in 1.12 > + csr pmpaddr24 # Added in 1.12 > + csr pmpaddr25 # Added in 1.12 > + csr pmpaddr26 # Added in 1.12 > + csr pmpaddr27 # Added in 1.12 > + csr pmpaddr28 # Added in 1.12 > + csr pmpaddr29 # Added in 1.12 > + csr pmpaddr30 # Added in 1.12 > + csr pmpaddr31 # Added in 1.12 > + csr pmpaddr32 # Added in 1.12 > + csr pmpaddr33 # Added in 1.12 > + csr pmpaddr34 # Added in 1.12 > + csr pmpaddr35 # Added in 1.12 > + csr pmpaddr36 # Added in 1.12 > + csr pmpaddr37 # Added in 1.12 > + csr pmpaddr38 # Added in 1.12 > + csr pmpaddr39 # Added in 1.12 > + csr pmpaddr40 # Added in 1.12 > + csr pmpaddr41 # Added in 1.12 > + csr pmpaddr42 # Added in 1.12 > + csr pmpaddr43 # Added in 1.12 > + csr pmpaddr44 # Added in 1.12 > + csr pmpaddr45 # Added in 1.12 > + csr pmpaddr46 # Added in 1.12 > + csr pmpaddr47 # Added in 1.12 > + csr pmpaddr48 # Added in 1.12 > + csr pmpaddr49 # Added in 1.12 > + csr pmpaddr50 # Added in 1.12 > + csr pmpaddr51 # Added in 1.12 > + csr pmpaddr52 # Added in 1.12 > + csr pmpaddr53 # Added in 1.12 > + csr pmpaddr54 # Added in 1.12 > + csr pmpaddr55 # Added in 1.12 > + csr pmpaddr56 # Added in 1.12 > + csr pmpaddr57 # Added in 1.12 > + csr pmpaddr58 # Added in 1.12 > + csr pmpaddr59 # Added in 1.12 > + csr pmpaddr60 # Added in 1.12 > + csr pmpaddr61 # Added in 1.12 > + csr pmpaddr62 # Added in 1.12 > + csr pmpaddr63 # Added in 1.12 > > # Machine Counter/Timer > csr mcycle > -- > 2.32.0 >