projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ff60545)
[PATCH, BINUTILS, AARCH64, 8/9] Add SCXTNUM_ELx and ID_PFR2_EL1 system registers
authorSudakshina Das <sudi.das@arm.com>
Wed, 26 Sep 2018 10:02:28 +0000 (11:02 +0100)
committerRichard Earnshaw <Richard.Earnshaw@arm.com>
Tue, 9 Oct 2018 14:39:29 +0000 (15:39 +0100)
This patch is part of the patch series to add support for ARMv8.5-A
extensions.
(https://developer.arm.com/products/architecture/cpu-architecture/a-profile/exploration-tools)
The encodings can be found in the System Register XML.

This patch adds the new system registers SCXTNUM_ELx and ID_PFR2_EL1.

*** include/ChangeLog ***

2018-10-09  Sudakshina Das  <sudi.das@arm.com>

* opcode/aarch64.h (AARCH64_FEATURE_SCXTNUM): New.
(AARCH64_FEATURE_ID_PFR2): New.
(AARCH64_ARCH_V8_5): Add both by default.

*** opcodes/ChangeLog ***

2018-10-09  Sudakshina Das  <sudi.das@arm.com>

* aarch64-opc.c (aarch64_sys_regs): New entries for
scxtnum_el[0,1,2,3,12] and id_pfr2_el1.
(aarch64_sys_reg_supported_p): New checks for above.

*** gas/ChangeLog ***

2018-10-09  Sudakshina Das  <sudi.das@arm.com>

* testsuite/gas/aarch64/sysreg-4.s: Test registers
scxtnum_el[0,1,2,3,12] and id_pfr2_el1.
* testsuite/gas/aarch64/sysreg-4.d: Likewise.
* testsuite/gas/aarch64/illegal-sysreg-4.l: Likewise.

gas/ChangeLog patch | blob | history
gas/testsuite/gas/aarch64/illegal-sysreg-4.l patch | blob | history
gas/testsuite/gas/aarch64/sysreg-4.d patch | blob | history
gas/testsuite/gas/aarch64/sysreg-4.s patch | blob | history
include/ChangeLog patch | blob | history
include/opcode/aarch64.h patch | blob | history
opcodes/ChangeLog patch | blob | history
opcodes/aarch64-opc.c patch | blob | history

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6ed2407ebb5f713b2d5843b4d4b1f8852f506233..fc6dc90004c7b5fddcd568ba5117c0d665278ea4 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2018-10-09  Sudakshina Das  <sudi.das@arm.com>
+
+       * testsuite/gas/aarch64/sysreg-4.s: Test registers
+       scxtnum_el[0,1,2,3,12] and id_pfr2_el1.
+       * testsuite/gas/aarch64/sysreg-4.d: Likewise.
+       * testsuite/gas/aarch64/illegal-sysreg-4.l: Likewise.
+
 2018-10-09  Sudakshina Das  <sudi.das@arm.com>
 
        * config/tc-aarch64.c (parse_bti_operand): New.
diff --git a/gas/testsuite/gas/aarch64/illegal-sysreg-4.l b/gas/testsuite/gas/aarch64/illegal-sysreg-4.l
index 2e0851c6855b82cdcf7fcd7b803eb102705d99d5..35c3ceae37be549015b1561da275a2cde3ea2caa 100644 (file)
--- a/gas/testsuite/gas/aarch64/illegal-sysreg-4.l
+++ b/gas/testsuite/gas/aarch64/illegal-sysreg-4.l
@@ -8,3 +8,9 @@
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'cvadp'
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'rndr'
 [^:]*:[0-9]+: Error: selected processor does not support system register name 'rndrrs'
+[^:]*:[0-9]+: Error: selected processor does not support system register name 'scxtnum_el0'
+[^:]*:[0-9]+: Error: selected processor does not support system register name 'scxtnum_el1'
+[^:]*:[0-9]+: Error: selected processor does not support system register name 'scxtnum_el2'
+[^:]*:[0-9]+: Error: selected processor does not support system register name 'scxtnum_el3'
+[^:]*:[0-9]+: Error: selected processor does not support system register name 'scxtnum_el12'
+[^:]*:[0-9]+: Error: selected processor does not support system register name 'id_pfr2_el1'
diff --git a/gas/testsuite/gas/aarch64/sysreg-4.d b/gas/testsuite/gas/aarch64/sysreg-4.d
index 3ce7501908003bc6d0d6fe61f7f95aa3f227d53c..c24a2326c34a9ad672909c64ac1aff92136b1f05 100644 (file)
--- a/gas/testsuite/gas/aarch64/sysreg-4.d
+++ b/gas/testsuite/gas/aarch64/sysreg-4.d
@@ -13,3 +13,9 @@ Disassembly of section \.text:
 .*:    d50b7d24        dc      cvadp, x4
 .*:    d53b2405        mrs     x5, rndr
 .*:    d53b2426        mrs     x6, rndrrs
+.*:    d53bd0e7        mrs     x7, scxtnum_el0
+.*:    d538d0e7        mrs     x7, scxtnum_el1
+.*:    d53cd0e7        mrs     x7, scxtnum_el2
+.*:    d53ed0e7        mrs     x7, scxtnum_el3
+.*:    d53dd0e7        mrs     x7, scxtnum_el12
+.*:    d5380388        mrs     x8, id_pfr2_el1
diff --git a/gas/testsuite/gas/aarch64/sysreg-4.s b/gas/testsuite/gas/aarch64/sysreg-4.s
index 30decbd843b3017f2b8aef1159405fcbcbbc2c0b..b8f40d478a19773d7b74bb87f6b001fe5b663c43 100644 (file)
--- a/gas/testsuite/gas/aarch64/sysreg-4.s
+++ b/gas/testsuite/gas/aarch64/sysreg-4.s
@@ -6,3 +6,9 @@ func:
        dc cvadp, x4
        mrs x5, rndr
        mrs x6, rndrrs
+       mrs x7, scxtnum_el0
+       mrs x7, scxtnum_el1
+       mrs x7, scxtnum_el2
+       mrs x7, scxtnum_el3
+       mrs x7, scxtnum_el12
+       mrs x8, id_pfr2_el1
diff --git a/include/ChangeLog b/include/ChangeLog
index f57d20555dba73c568140292ecb7d00dde838c35..ed5dcf2cc32dfc1ba40b1497be5d8390ad716e54 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-09  Sudakshina Das  <sudi.das@arm.com>
+
+       * opcode/aarch64.h (AARCH64_FEATURE_SCXTNUM): New.
+       (AARCH64_FEATURE_ID_PFR2): New.
+       (AARCH64_ARCH_V8_5): Add both by default.
+
 2018-10-09  Sudakshina Das  <sudi.das@arm.com>
 
        * opcode/aarch64.h (AARCH64_FEATURE_BTI): New.
diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h
index 144ec7e894c01bbe0671ff9061a995f06cb087c3..b56f9070149e592824bc95f84da492615d875ff2 100644 (file)
--- a/include/opcode/aarch64.h
+++ b/include/opcode/aarch64.h
@@ -78,6 +78,11 @@ typedef uint32_t aarch64_insn;
 #define AARCH64_FEATURE_RNG            0x80000000000ULL
 /* BTI instructions.  */
 #define AARCH64_FEATURE_BTI            0x100000000000ULL
+/* SCXTNUM_ELx.  */
+#define AARCH64_FEATURE_SCXTNUM                0x200000000000ULL
+/* ID_PFR2 instructions.  */
+#define AARCH64_FEATURE_ID_PFR2                0x400000000000ULL
+
 
 /* Architectures are the sum of the base and extensions.  */
 #define AARCH64_ARCH_V8                AARCH64_FEATURE (AARCH64_FEATURE_V8, \
@@ -108,7 +113,9 @@ typedef uint32_t aarch64_insn;
                                                 | AARCH64_FEATURE_SB   \
                                                 | AARCH64_FEATURE_PREDRES \
                                                 | AARCH64_FEATURE_CVADP \
-                                                | AARCH64_FEATURE_BTI)
+                                                | AARCH64_FEATURE_BTI  \
+                                                | AARCH64_FEATURE_SCXTNUM \
+                                                | AARCH64_FEATURE_ID_PFR2)
 
 
 #define AARCH64_ARCH_NONE      AARCH64_FEATURE (0, 0)
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 15c1bac679632abd35253e3e676ec98ee0138593..776aa0fee2433559050b1c2cc01388112539be5d 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-09  Sudakshina Das  <sudi.das@arm.com>
+
+       * aarch64-opc.c (aarch64_sys_regs): New entries for
+       scxtnum_el[0,1,2,3,12] and id_pfr2_el1.
+       (aarch64_sys_reg_supported_p): New checks for above.
+
 2018-10-09  Sudakshina Das  <sudi.das@arm.com>
 
        * aarch64-opc.h (HINT_OPD_NOPRINT, HINT_ENCODE): New.
diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c
index d2a4f2f97e28f5a2d22ed042f3c753ffd6c969af..4cf39d262c99ce12a9b024b835f1b3a671ec7d72 100644 (file)
--- a/opcodes/aarch64-opc.c
+++ b/opcodes/aarch64-opc.c
@@ -3733,6 +3733,7 @@ const aarch64_sys_reg aarch64_sys_regs [] =
   { "id_dfr0_el1",      CPENC(3,0,C0,C1,2),    F_REG_READ }, /* RO */
   { "id_pfr0_el1",      CPENC(3,0,C0,C1,0),    F_REG_READ }, /* RO */
   { "id_pfr1_el1",      CPENC(3,0,C0,C1,1),    F_REG_READ }, /* RO */
+  { "id_pfr2_el1",      CPENC(3,0,C0,C3,4),    F_ARCHEXT | F_REG_READ}, /* RO */
   { "id_afr0_el1",      CPENC(3,0,C0,C1,3),    F_REG_READ }, /* RO */
   { "id_mmfr0_el1",     CPENC(3,0,C0,C1,4),    F_REG_READ }, /* RO */
   { "id_mmfr1_el1",     CPENC(3,0,C0,C1,5),    F_REG_READ }, /* RO */
@@ -3869,6 +3870,11 @@ const aarch64_sys_reg aarch64_sys_regs [] =
   { "tpidr_el1",        CPENC(3,0,C13,C0,4),   0 },
   { "tpidr_el2",        CPENC(3,4,C13,C0,2),   0 },
   { "tpidr_el3",        CPENC(3,6,C13,C0,2),   0 },
+  { "scxtnum_el0",      CPENC(3,3,C13,C0,7), F_ARCHEXT },
+  { "scxtnum_el1",      CPENC(3,0,C13,C0,7), F_ARCHEXT },
+  { "scxtnum_el2",      CPENC(3,4,C13,C0,7), F_ARCHEXT },
+  { "scxtnum_el12",     CPENC(3,5,C13,C0,7), F_ARCHEXT },
+  { "scxtnum_el3",      CPENC(3,6,C13,C0,7), F_ARCHEXT },
   { "teecr32_el1",      CPENC(2,2,C0, C0,0),   0 }, /* See section 3.9.7.1 */
   { "cntfrq_el0",       CPENC(3,3,C14,C0,0),   0 }, /* RW */
   { "cntpct_el0",       CPENC(3,3,C14,C0,1),   F_REG_READ }, /* RO */
@@ -4108,6 +4114,20 @@ aarch64_sys_reg_supported_p (const aarch64_feature_set features,
       && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_PAN))
     return FALSE;
 
+  /* SCXTNUM_ELx registers.  */
+  if ((reg->value == CPENC (3, 3, C13, C0, 7)
+       || reg->value == CPENC (3, 0, C13, C0, 7)
+       || reg->value == CPENC (3, 4, C13, C0, 7)
+       || reg->value == CPENC (3, 6, C13, C0, 7)
+       || reg->value == CPENC (3, 5, C13, C0, 7))
+      && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_SCXTNUM))
+      return FALSE;
+
+  /* ID_PFR2_EL1 register.  */
+  if (reg->value == CPENC(3, 0, C0, C3, 4)
+      && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_ID_PFR2))
+    return FALSE;
+
   /* Virtualization host extensions: system registers.  */
   if ((reg->value == CPENC (3, 4, C2, C0, 1)
        || reg->value == CPENC (3, 4, C13, C0, 1)