[PATCH] aarch64: Add support for ccontidr_el1 system register

Muhammad Kamran muhammad.kamran@arm.com
Mon Nov 16 10:52:26 GMT 2026


Add the read-only ccontidr_el1 system register and a sysreg test
that reads it.  Extend the sysreg-diagnostic test to attempt to
write to the register.
---
 gas/testsuite/gas/aarch64/sysreg/sysreg-13.d         | 9 +++++++++
 gas/testsuite/gas/aarch64/sysreg/sysreg-13.s         | 3 +++
 gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.d | 1 +
 gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.l | 1 +
 gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.s | 1 +
 opcodes/aarch64-sys-regs.def                         | 1 +
 6 files changed, 16 insertions(+)
 create mode 100644 gas/testsuite/gas/aarch64/sysreg/sysreg-13.d
 create mode 100644 gas/testsuite/gas/aarch64/sysreg/sysreg-13.s

diff --git a/gas/testsuite/gas/aarch64/sysreg/sysreg-13.d b/gas/testsuite/gas/aarch64/sysreg/sysreg-13.d
new file mode 100644
index 00000000000..fe7b5f4dff5
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/sysreg/sysreg-13.d
@@ -0,0 +1,9 @@
+#as: -I$srcdir/$subdir
+#objdump: -dr
+
+.*:     file format .*
+
+[^:]+:
+
+0+ <.*>:
+.*:	d5390060 	mrs	x0, ccontidr_el1
diff --git a/gas/testsuite/gas/aarch64/sysreg/sysreg-13.s b/gas/testsuite/gas/aarch64/sysreg/sysreg-13.s
new file mode 100644
index 00000000000..351ed5588ba
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/sysreg/sysreg-13.s
@@ -0,0 +1,3 @@
+.include "sysreg-test-utils.inc"
+
+	rw_sys_reg ccontidr_el1 w=0
diff --git a/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.d b/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.d
index e88d74ee215..72b52291e87 100644
--- a/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.d
+++ b/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.d
@@ -15,3 +15,4 @@ Disassembly of section \.text:
 .*:	d5180640 	msr	id_aa64isar2_el1, x0  // note: writing to a read-only register
 .*:	d5180660 	msr	id_aa64isar3_el1, x0  // note: writing to a read-only register
 .*:	d5339c80 	mrs	x0, spmzr_el0  // note: reading from a write-only register
+.*:	d5190060 	msr	ccontidr_el1, x0  // note: writing to a read-only register
diff --git a/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.l b/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.l
index 384f0730d15..a421102e306 100644
--- a/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.l
+++ b/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.l
@@ -5,3 +5,4 @@
 .*:7: Warning: specified register cannot be written to at operand 1 -- `msr id_aa64isar2_el1,x0'
 .*:8: Warning: specified register cannot be written to at operand 1 -- `msr id_aa64isar3_el1,x0'
 .*: Warning: specified register cannot be read from at operand 2 -- `mrs x0,spmzr_el0'
+.*: Warning: specified register cannot be written to at operand 1 -- `msr ccontidr_el1,x0'
diff --git a/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.s b/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.s
index 607309576fe..6489a2ea397 100644
--- a/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.s
+++ b/gas/testsuite/gas/aarch64/sysreg/sysreg-diagnostic.s
@@ -7,3 +7,4 @@
 	msr	id_aa64isar2_el1, x0
 	msr	id_aa64isar3_el1, x0
 	mrs	x0, spmzr_el0
+	msr	ccontidr_el1, x0
diff --git a/opcodes/aarch64-sys-regs.def b/opcodes/aarch64-sys-regs.def
index b06c76fbebf..cb5f402ded5 100644
--- a/opcodes/aarch64-sys-regs.def
+++ b/opcodes/aarch64-sys-regs.def
@@ -371,6 +371,7 @@
   SYSREG ("brbtgt9_el1",	CPENC (2,1,8,9,2),	F_REG_READ,	AARCH64_FEATURE (V9_1A)) /* BRBE */
   SYSREG ("brbtgtinj_el1",	CPENC (2,1,9,1,2),	0,		AARCH64_FEATURE (V9_1A)) /* BRBE */
   SYSREG ("brbts_el1",		CPENC (2,1,9,0,2),	0,		AARCH64_FEATURE (V9_1A)) /* BRBE */
+  SYSREG ("ccontidr_el1",	CPENC (3,1,0,0,3),	F_REG_READ,	AARCH64_NO_FEATURES)
   SYSREG ("ccsidr2_el1",	CPENC (3,1,0,0,2),	F_REG_READ,	AARCH64_FEATURE (V8_2A)) /* CCIDX */
   SYSREG ("ccsidr_el1",		CPENC (3,1,0,0,0),	F_REG_READ,	AARCH64_NO_FEATURES)
   SYSREG ("clidr_el1",		CPENC (3,1,0,0,1),	F_REG_READ,	AARCH64_NO_FEATURES)
-- 
2.43.0



More information about the Binutils mailing list