[binutils-gdb] Revert "aarch64: Add FEAT_MPAMv2_VID system registers"
Richard Earnshaw via Binutils-cvs <[email protected]> Thu, 2 Jul 2026 12:44:33 +0000 (GMT)
| Newsgroups | gmane.comp.gnu.binutils.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fbb2ff78536f848b2df6b8d430b618080745c8f6 commit fbb2ff78536f848b2df6b8d430b618080745c8f6 Author: Richard Earnshaw <[email protected]> Date: Mon Jun 29 16:36:22 2026 +0100 Revert "aarch64: Add FEAT_MPAMv2_VID system registers" This reverts commit 5fc6b09c078532fa4206a350e34d82488b80a5fb. Diff: --- gas/testsuite/gas/aarch64/sysreg/mpamv2_vid-bad.d | 3 --- gas/testsuite/gas/aarch64/sysreg/mpamv2_vid-bad.l | 13 ------------- gas/testsuite/gas/aarch64/sysreg/mpamv2_vid.d | 14 -------------- gas/testsuite/gas/aarch64/sysreg/mpamv2_vid.s | 5 ----- opcodes/aarch64-sys-regs.def | 3 --- 5 files changed, 38 deletions(-) diff --git a/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid-bad.d b/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid-bad.d deleted file mode 100644 index 5d00da59694..00000000000 --- a/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid-bad.d +++ /dev/null @@ -1,3 +0,0 @@ -#as: -march=armv9.4-a -menable-sysreg-checking -I$srcdir/$subdir -#source: mpamv2_vid.s -#error_output: mpamv2_vid-bad.l diff --git a/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid-bad.l b/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid-bad.l deleted file mode 100644 index 6ab3d16fba0..00000000000 --- a/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid-bad.l +++ /dev/null @@ -1,13 +0,0 @@ -.*: Assembler messages: -.*: Error: selected processor does not support system register name 'mpamvidcr_el2' -.*: Info: macro invoked from here -.*: Error: selected processor does not support system register name 'mpamvidcr_el2' -.*: Info: macro invoked from here -.*: Error: selected processor does not support system register name 'mpamvidsr_el2' -.*: Info: macro invoked from here -.*: Error: selected processor does not support system register name 'mpamvidsr_el2' -.*: Info: macro invoked from here -.*: Error: selected processor does not support system register name 'mpamvidsr_el3' -.*: Info: macro invoked from here -.*: Error: selected processor does not support system register name 'mpamvidsr_el3' -.*: Info: macro invoked from here diff --git a/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid.d b/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid.d deleted file mode 100644 index 88c0c1883d8..00000000000 --- a/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid.d +++ /dev/null @@ -1,14 +0,0 @@ -#as: -menable-sysreg-checking -march=armv8-a+mpamv2 -I$srcdir/$subdir -#objdump: -dr - -.*: file format .* - -Disassembly of section \.text: - -0+ <.*>: -.*: d51ca700 msr mpamvidcr_el2, x0 -.*: d53ca700 mrs x0, mpamvidcr_el2 -.*: d51ca720 msr mpamvidsr_el2, x0 -.*: d53ca720 mrs x0, mpamvidsr_el2 -.*: d51ea720 msr mpamvidsr_el3, x0 -.*: d53ea720 mrs x0, mpamvidsr_el3 diff --git a/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid.s b/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid.s deleted file mode 100644 index 132d48f0781..00000000000 --- a/gas/testsuite/gas/aarch64/sysreg/mpamv2_vid.s +++ /dev/null @@ -1,5 +0,0 @@ -.include "sysreg-test-utils.inc" - - rw_sys_reg mpamvidcr_el2 - rw_sys_reg mpamvidsr_el2 - rw_sys_reg mpamvidsr_el3 diff --git a/opcodes/aarch64-sys-regs.def b/opcodes/aarch64-sys-regs.def index 9daa178ed7b..6f9f2b4c0a8 100644 --- a/opcodes/aarch64-sys-regs.def +++ b/opcodes/aarch64-sys-regs.def @@ -929,9 +929,6 @@ SYSREG ("mpamhcr_el2", CPENC (3,4,10,4,0), 0, AARCH64_FEATURE (V8_2A)) /* MPAM */ SYSREG ("mpamidr_el1", CPENC (3,0,10,4,4), F_REG_READ, AARCH64_FEATURE (V8_2A)) /* MPAM */ SYSREG ("mpamsm_el1", CPENC (3,0,10,5,3), 0, AARCH64_FEATURES (2, SME, V8_2A)) /* SME && MPAM */ - SYSREG ("mpamvidcr_el2", CPENC (3,4,10,7,0), 0, AARCH64_FEATURE (MPAMv2)) - SYSREG ("mpamvidsr_el2", CPENC (3,4,10,7,1), 0, AARCH64_FEATURE (MPAMv2)) - SYSREG ("mpamvidsr_el3", CPENC (3,6,10,7,1), 0, AARCH64_FEATURE (MPAMv2)) SYSREG ("mpamvpm0_el2", CPENC (3,4,10,6,0), 0, AARCH64_FEATURE (V8_2A)) /* MPAM */ SYSREG ("mpamvpm1_el2", CPENC (3,4,10,6,1), 0, AARCH64_FEATURE (V8_2A)) /* MPAM */ SYSREG ("mpamvpm2_el2", CPENC (3,4,10,6,2), 0, AARCH64_FEATURE (V8_2A)) /* MPAM */