3 files changed, 166 insertions, 0 deletions
diff --git a/gas/testsuite/gas/aarch64/armv8_9-a-sysregs-bad.l b/gas/testsuite/gas/aarch64/armv8_9-a-sysregs-bad.l
index 1b67843..71ec06e 100644
--- a/gas/testsuite/gas/aarch64/armv8_9-a-sysregs-bad.l
+++ b/gas/testsuite/gas/aarch64/armv8_9-a-sysregs-bad.l
@@ -27,3 +27,53 @@
 .*: Error: selected processor does not support system register name 's1e1a'
 .*: Error: selected processor does not support system register name 's1e2a'
 .*: Error: selected processor does not support system register name 's1e3a'
+.*: Error: selected processor does not support system register name 'amair2_el1'
+.*: Error: selected processor does not support system register name 'amair2_el12'
+.*: Error: selected processor does not support system register name 'amair2_el2'
+.*: Error: selected processor does not support system register name 'amair2_el3'
+.*: Error: selected processor does not support system register name 'mair2_el1'
+.*: Error: selected processor does not support system register name 'mair2_el12'
+.*: Error: selected processor does not support system register name 'mair2_el2'
+.*: Error: selected processor does not support system register name 'mair2_el3'
+.*: Error: selected processor does not support system register name 'amair2_el1'
+.*: Error: selected processor does not support system register name 'amair2_el12'
+.*: Error: selected processor does not support system register name 'amair2_el2'
+.*: Error: selected processor does not support system register name 'amair2_el3'
+.*: Error: selected processor does not support system register name 'mair2_el1'
+.*: Error: selected processor does not support system register name 'mair2_el12'
+.*: Error: selected processor does not support system register name 'mair2_el2'
+.*: Error: selected processor does not support system register name 'mair2_el3'
+.*: Error: selected processor does not support system register name 'pir_el1'
+.*: Error: selected processor does not support system register name 'pir_el12'
+.*: Error: selected processor does not support system register name 'pir_el2'
+.*: Error: selected processor does not support system register name 'pir_el3'
+.*: Error: selected processor does not support system register name 'pire0_el1'
+.*: Error: selected processor does not support system register name 'pire0_el12'
+.*: Error: selected processor does not support system register name 'pire0_el2'
+.*: Error: selected processor does not support system register name 'pir_el1'
+.*: Error: selected processor does not support system register name 'pir_el12'
+.*: Error: selected processor does not support system register name 'pir_el2'
+.*: Error: selected processor does not support system register name 'pir_el3'
+.*: Error: selected processor does not support system register name 'pire0_el1'
+.*: Error: selected processor does not support system register name 'pire0_el12'
+.*: Error: selected processor does not support system register name 'pire0_el2'
+.*: Error: selected processor does not support system register name 's2pir_el2'
+.*: Error: selected processor does not support system register name 's2pir_el2'
+.*: Error: selected processor does not support system register name 'por_el0'
+.*: Error: selected processor does not support system register name 'por_el1'
+.*: Error: selected processor does not support system register name 'por_el12'
+.*: Error: selected processor does not support system register name 'por_el2'
+.*: Error: selected processor does not support system register name 'por_el3'
+.*: Error: selected processor does not support system register name 'por_el0'
+.*: Error: selected processor does not support system register name 'por_el1'
+.*: Error: selected processor does not support system register name 'por_el12'
+.*: Error: selected processor does not support system register name 'por_el2'
+.*: Error: selected processor does not support system register name 'por_el3'
+.*: Error: selected processor does not support system register name 's2por_el1'
+.*: Error: selected processor does not support system register name 's2por_el1'
+.*: Error: selected processor does not support system register name 'tcr2_el1'
+.*: Error: selected processor does not support system register name 'tcr2_el12'
+.*: Error: selected processor does not support system register name 'tcr2_el2'
+.*: Error: selected processor does not support system register name 'tcr2_el1'
+.*: Error: selected processor does not support system register name 'tcr2_el12'
+.*: Error: selected processor does not support system register name 'tcr2_el2'
diff --git a/gas/testsuite/gas/aarch64/armv8_9-a-sysregs.d b/gas/testsuite/gas/aarch64/armv8_9-a-sysregs.d
index 18376bb..ea4cc86 100644
--- a/gas/testsuite/gas/aarch64/armv8_9-a-sysregs.d
+++ b/gas/testsuite/gas/aarch64/armv8_9-a-sysregs.d
@@ -34,3 +34,53 @@ Disassembly of section \.text:
 .*:	d5087941 	at	s1e1a, x1
 .*:	d50c7943 	at	s1e2a, x3
 .*:	d50e7945 	at	s1e3a, x5
+.*:	d538a320 	mrs	x0, amair2_el1
+.*:	d53da320 	mrs	x0, amair2_el12
+.*:	d53ca320 	mrs	x0, amair2_el2
+.*:	d53ea320 	mrs	x0, amair2_el3
+.*:	d538a220 	mrs	x0, mair2_el1
+.*:	d53da220 	mrs	x0, mair2_el12
+.*:	d53ca120 	mrs	x0, mair2_el2
+.*:	d53ea120 	mrs	x0, mair2_el3
+.*:	d518a320 	msr	amair2_el1, x0
+.*:	d51da320 	msr	amair2_el12, x0
+.*:	d51ca320 	msr	amair2_el2, x0
+.*:	d51ea320 	msr	amair2_el3, x0
+.*:	d518a220 	msr	mair2_el1, x0
+.*:	d51da220 	msr	mair2_el12, x0
+.*:	d51ca120 	msr	mair2_el2, x0
+.*:	d51ea120 	msr	mair2_el3, x0
+.*:	d538a260 	mrs	x0, pir_el1
+.*:	d53da260 	mrs	x0, pir_el12
+.*:	d53ca260 	mrs	x0, pir_el2
+.*:	d53ea260 	mrs	x0, pir_el3
+.*:	d538a240 	mrs	x0, pire0_el1
+.*:	d53da240 	mrs	x0, pire0_el12
+.*:	d53ca240 	mrs	x0, pire0_el2
+.*:	d518a260 	msr	pir_el1, x0
+.*:	d51da260 	msr	pir_el12, x0
+.*:	d51ca260 	msr	pir_el2, x0
+.*:	d51ea260 	msr	pir_el3, x0
+.*:	d518a240 	msr	pire0_el1, x0
+.*:	d51da240 	msr	pire0_el12, x0
+.*:	d51ca240 	msr	pire0_el2, x0
+.*:	d53ca2a0 	mrs	x0, s2pir_el2
+.*:	d51ca2a0 	msr	s2pir_el2, x0
+.*:	d53ba280 	mrs	x0, por_el0
+.*:	d538a280 	mrs	x0, por_el1
+.*:	d53da280 	mrs	x0, por_el12
+.*:	d53ca280 	mrs	x0, por_el2
+.*:	d53ea280 	mrs	x0, por_el3
+.*:	d51ba280 	msr	por_el0, x0
+.*:	d518a280 	msr	por_el1, x0
+.*:	d51da280 	msr	por_el12, x0
+.*:	d51ca280 	msr	por_el2, x0
+.*:	d51ea280 	msr	por_el3, x0
+.*:	d538a2a0 	mrs	x0, s2por_el1
+.*:	d518a2a0 	msr	s2por_el1, x0
+.*:	d5382060 	mrs	x0, tcr2_el1
+.*:	d53d2060 	mrs	x0, tcr2_el12
+.*:	d53c2060 	mrs	x0, tcr2_el2
+.*:	d5182060 	msr	tcr2_el1, x0
+.*:	d51d2060 	msr	tcr2_el12, x0
+.*:	d51c2060 	msr	tcr2_el2, x0
diff --git a/gas/testsuite/gas/aarch64/armv8_9-a-sysregs.s b/gas/testsuite/gas/aarch64/armv8_9-a-sysregs.s
index 4e494a9..2768c26 100644
--- a/gas/testsuite/gas/aarch64/armv8_9-a-sysregs.s
+++ b/gas/testsuite/gas/aarch64/armv8_9-a-sysregs.s
@@ -32,3 +32,69 @@
 	at s1e1a, x1
 	at s1e2a, x3
 	at s1e3a, x5
+
+	/* FEAT_AIE.  */
+	mrs x0, amair2_el1
+	mrs x0, amair2_el12
+	mrs x0, amair2_el2
+	mrs x0, amair2_el3
+	mrs x0, mair2_el1
+	mrs x0, mair2_el12
+	mrs x0, mair2_el2
+	mrs x0, mair2_el3
+
+	msr amair2_el1, x0
+	msr amair2_el12, x0
+	msr amair2_el2, x0
+	msr amair2_el3, x0
+	msr mair2_el1, x0
+	msr mair2_el12, x0
+	msr mair2_el2, x0
+	msr mair2_el3, x0
+
+	/* FEAT_S1PIE.  */
+	mrs x0, pir_el1
+	mrs x0, pir_el12
+	mrs x0, pir_el2
+	mrs x0, pir_el3
+	mrs x0, pire0_el1
+	mrs x0, pire0_el12
+	mrs x0, pire0_el2
+
+	msr pir_el1, x0
+	msr pir_el12, x0
+	msr pir_el2, x0
+	msr pir_el3, x0
+	msr pire0_el1, x0
+	msr pire0_el12, x0
+	msr pire0_el2, x0
+
+	/* FEAT_S2PIE.  */
+	mrs x0, s2pir_el2
+	msr s2pir_el2, x0
+
+	/* FEAT_S1POE.  */
+	mrs x0, por_el0
+	mrs x0, por_el1
+	mrs x0, por_el12
+	mrs x0, por_el2
+	mrs x0, por_el3
+
+	msr por_el0, x0
+	msr por_el1, x0
+	msr por_el12, x0
+	msr por_el2, x0
+	msr por_el3, x0
+
+	/* FEAT_S21POE.  */
+	mrs x0, s2por_el1
+	msr s2por_el1, x0
+
+	/* FEAT_TCR2.  */
+	mrs x0, tcr2_el1
+	mrs x0, tcr2_el12
+	mrs x0, tcr2_el2
+
+	msr tcr2_el1, x0
+	msr tcr2_el12, x0
+	msr tcr2_el2, x0