[Aarch64][binutils] Support id_mmfr4 system register.

[Aarch64][binutils] Support id_mmfr4 system register.

[Matthew Wahab]

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

Hello,

The ARMv8 system registers include id_mmfr1 to id_mmfr4. The last
of these appears to have been omitted when support for ARMv8 was added to
binutils; this patch adds it.

Tested for aarch64-none-linux-gnu with check-gas and check-binutils.

Ok for trunk?
Matthew

opcodes/
2015-06-16  Matthew Wahab  <matthew.wahab@arm.com>

	* aarch64-opc.c (aarch64_sys_regs): Add "id_mmfr4_el1".

gas/testsuite
2015-06-16  Matthew Wahab  <matthew.wahab@arm.com>

	* sysreg.d: Add id_mmfr4_el1, update expected output.
	* sysreg.s: Add id_mmfr4_el1.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: sysreg_mmfr4.patch --]
[-- Type: text/x-patch; name=sysreg_mmfr4.patch, Size: 2295 bytes --]

diff --git a/gas/testsuite/gas/aarch64/sysreg.d b/gas/testsuite/gas/aarch64/sysreg.d
index 7795b4d..157340c 100644
--- a/gas/testsuite/gas/aarch64/sysreg.d
+++ b/gas/testsuite/gas/aarch64/sysreg.d
@@ -17,14 +17,15 @@ Disassembly of section \.text:
   24:	d53801a0 	mrs	x0, id_mmfr1_el1
   28:	d53801c0 	mrs	x0, id_mmfr2_el1
   2c:	d53801e0 	mrs	x0, id_mmfr3_el1
-  30:	d5380200 	mrs	x0, id_isar0_el1
-  34:	d5380220 	mrs	x0, id_isar1_el1
-  38:	d5380240 	mrs	x0, id_isar2_el1
-  3c:	d5380260 	mrs	x0, id_isar3_el1
-  40:	d5380280 	mrs	x0, id_isar4_el1
-  44:	d53802a0 	mrs	x0, id_isar5_el1
-  48:	d538cc00 	mrs	x0, s3_0_c12_c12_0
-  4c:	d5384600 	mrs	x0, s3_0_c4_c6_0
-  50:	d5184600 	msr	s3_0_c4_c6_0, x0
-  54:	d5310300 	mrs	x0, s2_1_c0_c3_0
-  58:	d5110300 	msr	s2_1_c0_c3_0, x0
+  30:	d53802c0 	mrs	x0, id_mmfr4_el1
+  34:	d5380200 	mrs	x0, id_isar0_el1
+  38:	d5380220 	mrs	x0, id_isar1_el1
+  3c:	d5380240 	mrs	x0, id_isar2_el1
+  40:	d5380260 	mrs	x0, id_isar3_el1
+  44:	d5380280 	mrs	x0, id_isar4_el1
+  48:	d53802a0 	mrs	x0, id_isar5_el1
+  4c:	d538cc00 	mrs	x0, s3_0_c12_c12_0
+  50:	d5384600 	mrs	x0, s3_0_c4_c6_0
+  54:	d5184600 	msr	s3_0_c4_c6_0, x0
+  58:	d5310300 	mrs	x0, s2_1_c0_c3_0
+  5c:	d5110300 	msr	s2_1_c0_c3_0, x0
diff --git a/gas/testsuite/gas/aarch64/sysreg.s b/gas/testsuite/gas/aarch64/sysreg.s
index b7e5ff6..8974674 100644
--- a/gas/testsuite/gas/aarch64/sysreg.s
+++ b/gas/testsuite/gas/aarch64/sysreg.s
@@ -16,6 +16,7 @@
 	mrs x0, id_mmfr1_el1
 	mrs x0, id_mmfr2_el1
 	mrs x0, id_mmfr3_el1
+	mrs x0, id_mmfr4_el1
 	mrs x0, id_isar0_el1
 	mrs x0, id_isar1_el1
 	mrs x0, id_isar2_el1
diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c
index 5c7ef86..9880142 100644
--- a/opcodes/aarch64-opc.c
+++ b/opcodes/aarch64-opc.c
@@ -2772,6 +2772,7 @@ const aarch64_sys_reg aarch64_sys_regs [] =
   { "id_mmfr1_el1",     CPENC(3,0,C0,C1,5),	0 }, /* RO */
   { "id_mmfr2_el1",     CPENC(3,0,C0,C1,6),	0 }, /* RO */
   { "id_mmfr3_el1",     CPENC(3,0,C0,C1,7),	0 }, /* RO */
+  { "id_mmfr4_el1",     CPENC(3,0,C0,C2,6),	0 }, /* RO */
   { "id_isar0_el1",     CPENC(3,0,C0,C2,0),	0 }, /* RO */
   { "id_isar1_el1",     CPENC(3,0,C0,C2,1),	0 }, /* RO */
   { "id_isar2_el1",     CPENC(3,0,C0,C2,2),	0 }, /* RO */

Re: [Aarch64][binutils] Support id_mmfr4 system register.

[Nicholas Clifton]

Hi Matthew,

> opcodes/
> 2015-06-16  Matthew Wahab  <matthew.wahab@arm.com>
>
>      * aarch64-opc.c (aarch64_sys_regs): Add "id_mmfr4_el1".
>
> gas/testsuite
> 2015-06-16  Matthew Wahab  <matthew.wahab@arm.com>
>
>      * sysreg.d: Add id_mmfr4_el1, update expected output.
>      * sysreg.s: Add id_mmfr4_el1.

Approved - please apply.

Cheers
   Nick