RISC-V: Add Privileged Architecture 1.12 CSRs

This commit adds,

* Most of CSRs as listed in the Privileged Architecture,
version 1.12 (except scontext and mscontext).

* Testcases for most CSRs added on the Privileged
Architecture, version 1.12 (except moved "scontext" and
new "mscontext").

include/ChangeLog:

	* opcode/riscv-opc.h (CSR_SENVCFG, CSR_MCONFIGPTR, CSR_MENVCFG,
	CSR_MSTATUSH, CSR_MENVCFGH, CSR_MTINST, CSR_MTVAL2, CSR_MSECCFG,
	CSR_MSECCFGH, CSR_PMPCFG4, CSR_PMPCFG5, CSR_PMPCFG6,
	CSR_PMPCFG7, CSR_PMPCFG8, CSR_PMPCFG9, CSR_PMPCFG10,
	CSR_PMPCFG11, CSR_PMPCFG12, CSR_PMPCFG13, CSR_PMPCFG14,
	CSR_PMPCFG15, CSR_PMPADDR16, CSR_PMPADDR17, CSR_PMPADDR18,
	CSR_PMPADDR19, CSR_PMPADDR20, CSR_PMPADDR21, CSR_PMPADDR22,
	CSR_PMPADDR23, CSR_PMPADDR24, CSR_PMPADDR25, CSR_PMPADDR26,
	CSR_PMPADDR27, CSR_PMPADDR28, CSR_PMPADDR29, CSR_PMPADDR30,
	CSR_PMPADDR31, CSR_PMPADDR32, CSR_PMPADDR33, CSR_PMPADDR34,
	CSR_PMPADDR35, CSR_PMPADDR36, CSR_PMPADDR37, CSR_PMPADDR38,
	CSR_PMPADDR39, CSR_PMPADDR40, CSR_PMPADDR41, CSR_PMPADDR42,
	CSR_PMPADDR43, CSR_PMPADDR44, CSR_PMPADDR45, CSR_PMPADDR46,
	CSR_PMPADDR47, CSR_PMPADDR48, CSR_PMPADDR49, CSR_PMPADDR50,
	CSR_PMPADDR51, CSR_PMPADDR52, CSR_PMPADDR53, CSR_PMPADDR54,
	CSR_PMPADDR55, CSR_PMPADDR56, CSR_PMPADDR57, CSR_PMPADDR58,
	CSR_PMPADDR59, CSR_PMPADDR60, CSR_PMPADDR61, CSR_PMPADDR62,
	CSR_PMPADDR63): New CSR macros.

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.

diff --git a/gas/testsuite/gas/riscv/csr-dw-regnums.d b/gas/testsuite/gas/riscv/csr-dw-regnums.d
index 2aa5ff4bcee80fe8994147414791fdf2abdfcfd4..e4bb865ed3f752ccf886dd4096cfa6b974ff8c3e 100644 (file)
--- 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 2431a23f37ca161d9b2080e1be261ef07335f5ce..34635d9c04fd53542c5085a543ecbb400b95904b 100644 (file)
--- 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 88da7240a782ce42fd867cbb0462ad8b30dbcfed..ef4cb65f19504b3a63b70a699a41e64b2911b642 100644 (file)
--- 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 ed6773e637ced7cac73075952d3e9be14771c3e1..c0cb2d5d279e25a03411dcf9538e2388e373cef6 100644 (file)
--- 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 b40c1d5d6b9733200e94db13d181a781848a36a9..a8586d9640865443eb4032f9c92dc4adf5706b54 100644 (file)
--- 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 44d9611fe49a85968932b23eb17e31b2cc68deea..36ca02a2b1f0100a04a1a753c9b7be1cf34ab16b 100644 (file)
--- 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 fbc30ee2fcca16c18d63563f75e626aba03511a2..8281910b89f90e7a07d049373a9d434e337de305 100644 (file)
--- 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 237cb8a1699b9470200d20f50c7f976006e6f5ee..387c6e2d4192e5bf393f6d71283c693b019049af 100644 (file)
--- 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 a96e8c9dbec31c6982b53935f41352bc01f9ec85..f5af018e1e1ac8013944067d82f3eb8b2a4c40fc 100644 (file)
--- 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 00d46f509debebd62ff05a7fe7b568980f5bd611..ca50442bc7ad14581c28c635ea05b736639e19e7 100644 (file)
--- 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 568328d70d9d3ff79ffa5c360fe0f45d684bffd4..cbb0e23991bdf6e1843d900be9d0b222b951e7e0 100644 (file)
--- 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

diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h
index 0b8cc6c7ddb47ab7b61842b65a3f23137bfa6eee..734d7862b2dc2bfcbfbd0008b002ed2f97d4d639 100644 (file)
--- a/include/opcode/riscv-opc.h
+++ b/include/opcode/riscv-opc.h
@@ -2108,6 +2108,7 @@
 #define CSR_SIE 0x104
 #define CSR_STVEC 0x105
 #define CSR_SCOUNTEREN 0x106
+#define CSR_SENVCFG 0x10a
 #define CSR_SSCRATCH 0x140
 #define CSR_SEPC 0x141
 #define CSR_SCAUSE 0x142
@@ -2118,6 +2119,7 @@
 #define CSR_MARCHID 0xf12
 #define CSR_MIMPID 0xf13
 #define CSR_MHARTID 0xf14
+#define CSR_MCONFIGPTR 0xf15
 #define CSR_MSTATUS 0x300
 #define CSR_MISA 0x301
 #define CSR_MEDELEG 0x302
@@ -2125,15 +2127,34 @@
 #define CSR_MIE 0x304
 #define CSR_MTVEC 0x305
 #define CSR_MCOUNTEREN 0x306
+#define CSR_MENVCFG 0x30a
+#define CSR_MSTATUSH 0x310
+#define CSR_MENVCFGH 0x31a
 #define CSR_MSCRATCH 0x340
 #define CSR_MEPC 0x341
 #define CSR_MCAUSE 0x342
 #define CSR_MTVAL 0x343
 #define CSR_MIP 0x344
+#define CSR_MTINST 0x34a
+#define CSR_MTVAL2 0x34b
+#define CSR_MSECCFG 0x747
+#define CSR_MSECCFGH 0x757
 #define CSR_PMPCFG0 0x3a0
 #define CSR_PMPCFG1 0x3a1
 #define CSR_PMPCFG2 0x3a2
 #define CSR_PMPCFG3 0x3a3
+#define CSR_PMPCFG4 0x3a4
+#define CSR_PMPCFG5 0x3a5
+#define CSR_PMPCFG6 0x3a6
+#define CSR_PMPCFG7 0x3a7
+#define CSR_PMPCFG8 0x3a8
+#define CSR_PMPCFG9 0x3a9
+#define CSR_PMPCFG10 0x3aa
+#define CSR_PMPCFG11 0x3ab
+#define CSR_PMPCFG12 0x3ac
+#define CSR_PMPCFG13 0x3ad
+#define CSR_PMPCFG14 0x3ae
+#define CSR_PMPCFG15 0x3af
 #define CSR_PMPADDR0 0x3b0
 #define CSR_PMPADDR1 0x3b1
 #define CSR_PMPADDR2 0x3b2
@@ -2150,6 +2171,54 @@
 #define CSR_PMPADDR13 0x3bd
 #define CSR_PMPADDR14 0x3be
 #define CSR_PMPADDR15 0x3bf
+#define CSR_PMPADDR16 0x3c0
+#define CSR_PMPADDR17 0x3c1
+#define CSR_PMPADDR18 0x3c2
+#define CSR_PMPADDR19 0x3c3
+#define CSR_PMPADDR20 0x3c4
+#define CSR_PMPADDR21 0x3c5
+#define CSR_PMPADDR22 0x3c6
+#define CSR_PMPADDR23 0x3c7
+#define CSR_PMPADDR24 0x3c8
+#define CSR_PMPADDR25 0x3c9
+#define CSR_PMPADDR26 0x3ca
+#define CSR_PMPADDR27 0x3cb
+#define CSR_PMPADDR28 0x3cc
+#define CSR_PMPADDR29 0x3cd
+#define CSR_PMPADDR30 0x3ce
+#define CSR_PMPADDR31 0x3cf
+#define CSR_PMPADDR32 0x3d0
+#define CSR_PMPADDR33 0x3d1
+#define CSR_PMPADDR34 0x3d2
+#define CSR_PMPADDR35 0x3d3
+#define CSR_PMPADDR36 0x3d4
+#define CSR_PMPADDR37 0x3d5
+#define CSR_PMPADDR38 0x3d6
+#define CSR_PMPADDR39 0x3d7
+#define CSR_PMPADDR40 0x3d8
+#define CSR_PMPADDR41 0x3d9
+#define CSR_PMPADDR42 0x3da
+#define CSR_PMPADDR43 0x3db
+#define CSR_PMPADDR44 0x3dc
+#define CSR_PMPADDR45 0x3dd
+#define CSR_PMPADDR46 0x3de
+#define CSR_PMPADDR47 0x3df
+#define CSR_PMPADDR48 0x3e0
+#define CSR_PMPADDR49 0x3e1
+#define CSR_PMPADDR50 0x3e2
+#define CSR_PMPADDR51 0x3e3
+#define CSR_PMPADDR52 0x3e4
+#define CSR_PMPADDR53 0x3e5
+#define CSR_PMPADDR54 0x3e6
+#define CSR_PMPADDR55 0x3e7
+#define CSR_PMPADDR56 0x3e8
+#define CSR_PMPADDR57 0x3e9
+#define CSR_PMPADDR58 0x3ea
+#define CSR_PMPADDR59 0x3eb
+#define CSR_PMPADDR60 0x3ec
+#define CSR_PMPADDR61 0x3ed
+#define CSR_PMPADDR62 0x3ee
+#define CSR_PMPADDR63 0x3ef
 #define CSR_MCYCLE 0xb00
 #define CSR_MINSTRET 0xb02
 #define CSR_MHPMCOUNTER3 0xb03
@@ -2709,6 +2778,7 @@ DECLARE_CSR(sideleg, CSR_SIDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_
 DECLARE_CSR(sie, CSR_SIE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(stvec, CSR_STVEC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(scounteren, CSR_SCOUNTEREN, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(senvcfg, CSR_SENVCFG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(sscratch, CSR_SSCRATCH, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(sepc, CSR_SEPC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(scause, CSR_SCAUSE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
@@ -2719,6 +2789,7 @@ DECLARE_CSR(mvendorid, CSR_MVENDORID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_S
 DECLARE_CSR(marchid, CSR_MARCHID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mimpid, CSR_MIMPID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mhartid, CSR_MHARTID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mconfigptr, CSR_MCONFIGPTR, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mstatus, CSR_MSTATUS, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(misa, CSR_MISA, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(medeleg, CSR_MEDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
@@ -2726,15 +2797,34 @@ DECLARE_CSR(mideleg, CSR_MIDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_
 DECLARE_CSR(mie, CSR_MIE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mtvec, CSR_MTVEC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mcounteren, CSR_MCOUNTEREN, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(menvcfg, CSR_MENVCFG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mstatush, CSR_MSTATUSH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(menvcfgh, CSR_MENVCFGH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mscratch, CSR_MSCRATCH, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mepc, CSR_MEPC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mcause, CSR_MCAUSE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mtval, CSR_MTVAL, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mip, CSR_MIP, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mtinst, CSR_MTINST, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mtval2, CSR_MTVAL2, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mseccfg, CSR_MSECCFG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mseccfgh, CSR_MSECCFGH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpcfg0, CSR_PMPCFG0, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpcfg1, CSR_PMPCFG1, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpcfg2, CSR_PMPCFG2, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpcfg3, CSR_PMPCFG3, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg4, CSR_PMPCFG4, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg5, CSR_PMPCFG5, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg6, CSR_PMPCFG6, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg7, CSR_PMPCFG7, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg8, CSR_PMPCFG8, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg9, CSR_PMPCFG9, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg10, CSR_PMPCFG10, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg11, CSR_PMPCFG11, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg12, CSR_PMPCFG12, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg13, CSR_PMPCFG13, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg14, CSR_PMPCFG14, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpcfg15, CSR_PMPCFG15, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpaddr0, CSR_PMPADDR0, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpaddr1, CSR_PMPADDR1, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpaddr2, CSR_PMPADDR2, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
@@ -2751,6 +2841,54 @@ DECLARE_CSR(pmpaddr12, CSR_PMPADDR12, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SP
 DECLARE_CSR(pmpaddr13, CSR_PMPADDR13, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpaddr14, CSR_PMPADDR14, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpaddr15, CSR_PMPADDR15, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr16, CSR_PMPADDR16, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr17, CSR_PMPADDR17, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr18, CSR_PMPADDR18, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr19, CSR_PMPADDR19, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr20, CSR_PMPADDR20, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr21, CSR_PMPADDR21, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr22, CSR_PMPADDR22, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr23, CSR_PMPADDR23, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr24, CSR_PMPADDR24, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr25, CSR_PMPADDR25, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr26, CSR_PMPADDR26, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr27, CSR_PMPADDR27, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr28, CSR_PMPADDR28, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr29, CSR_PMPADDR29, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr30, CSR_PMPADDR30, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr31, CSR_PMPADDR31, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr32, CSR_PMPADDR32, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr33, CSR_PMPADDR33, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr34, CSR_PMPADDR34, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr35, CSR_PMPADDR35, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr36, CSR_PMPADDR36, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr37, CSR_PMPADDR37, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr38, CSR_PMPADDR38, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr39, CSR_PMPADDR39, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr40, CSR_PMPADDR40, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr41, CSR_PMPADDR41, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr42, CSR_PMPADDR42, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr43, CSR_PMPADDR43, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr44, CSR_PMPADDR44, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr45, CSR_PMPADDR45, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr46, CSR_PMPADDR46, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr47, CSR_PMPADDR47, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr48, CSR_PMPADDR48, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr49, CSR_PMPADDR49, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr50, CSR_PMPADDR50, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr51, CSR_PMPADDR51, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr52, CSR_PMPADDR52, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr53, CSR_PMPADDR53, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr54, CSR_PMPADDR54, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr55, CSR_PMPADDR55, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr56, CSR_PMPADDR56, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr57, CSR_PMPADDR57, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr58, CSR_PMPADDR58, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr59, CSR_PMPADDR59, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr60, CSR_PMPADDR60, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr61, CSR_PMPADDR61, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr62, CSR_PMPADDR62, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(pmpaddr63, CSR_PMPADDR63, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mcycle, CSR_MCYCLE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(minstret, CSR_MINSTRET, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mhpmcounter3, CSR_MHPMCOUNTER3, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)