This patch introduces TRBE (Trace Buffer Extension) system registers for the AArch64...

gas           * testsuite/gas/aarch64/trbe-invalid.d: New test.
              * testsuite/gas/aarch64/trbe-invalid.l: New test.
              * testsuite/gas/aarch64/trbe-invalid.s: New test.
              * testsuite/gas/aarch64/trbe.d: New test.
              * testsuite/gas/aarch64/trbe.s: New test.

opcodes       * aarch64-opc.c: Add TRBE system registers TRBIDR_EL1 , TRBBASER_EL1 ,
              TRBLIMITR_EL1 , TRBMAR_EL1 , TRBPTR_EL1, TRBSR_EL1 and TRBTRG_EL1.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b58a2240b1c222ce4dee445d0e93555d3bbbde54..565c131965b34677a47912709854eb74180db7d4 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2020-09-28  Przemyslaw Wirkus  <przemyslaw.wirkus@arm.com>
+
+        * testsuite/gas/aarch64/trbe-invalid.d: New test.
+        * testsuite/gas/aarch64/trbe-invalid.l: New test.
+        * testsuite/gas/aarch64/trbe-invalid.s: New test.
+        * testsuite/gas/aarch64/trbe.d: New test.
+        * testsuite/gas/aarch64/trbe.s: New test.
+
 2020-09-28  Alex Coplan  <alex.coplan@arm.com>
 
        * config/tc-arm.c (arm_cpus): Add FP16 to Neoverse V1.

diff --git a/gas/testsuite/gas/aarch64/trbe-invalid.d b/gas/testsuite/gas/aarch64/trbe-invalid.d
new file mode 100644 (file)
index 0000000..a14c15e
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/trbe-invalid.d
@@ -0,0 +1,3 @@
+#name: Invalid TRBE System registers usage
+#source: trbe-invalid.s
+#warning_output: trbe-invalid.l

diff --git a/gas/testsuite/gas/aarch64/trbe-invalid.l b/gas/testsuite/gas/aarch64/trbe-invalid.l
new file mode 100644 (file)
index 0000000..c4865c5
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/trbe-invalid.l
@@ -0,0 +1,2 @@
+.*: Assembler messages:
+.*: Warning: specified register cannot be written to at operand 1 -- `msr trbidr_el1,x0'

diff --git a/gas/testsuite/gas/aarch64/trbe-invalid.s b/gas/testsuite/gas/aarch64/trbe-invalid.s
new file mode 100644 (file)
index 0000000..a37b585
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/trbe-invalid.s
@@ -0,0 +1,2 @@
+/* Write to R/O system register.  */
+msr trbidr_el1, x0

diff --git a/gas/testsuite/gas/aarch64/trbe.d b/gas/testsuite/gas/aarch64/trbe.d
new file mode 100644 (file)
index 0000000..04b83fb
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/trbe.d
@@ -0,0 +1,21 @@
+#name: TRBE System registers
+#objdump: -dr
+
+.*:     file format .*
+
+Disassembly of section \.text:
+
+0+ <.*>:
+.*:    d5389b40        mrs     x0, trbbaser_el1
+.*:    d5389be0        mrs     x0, trbidr_el1
+.*:    d5389b00        mrs     x0, trblimitr_el1
+.*:    d5389b80        mrs     x0, trbmar_el1
+.*:    d5389b20        mrs     x0, trbptr_el1
+.*:    d5389b60        mrs     x0, trbsr_el1
+.*:    d5389bc0        mrs     x0, trbtrg_el1
+.*:    d5189b40        msr     trbbaser_el1, x0
+.*:    d5189b00        msr     trblimitr_el1, x0
+.*:    d5189b80        msr     trbmar_el1, x0
+.*:    d5189b20        msr     trbptr_el1, x0
+.*:    d5189b60        msr     trbsr_el1, x0
+.*:    d5189bc0        msr     trbtrg_el1, x0

diff --git a/gas/testsuite/gas/aarch64/trbe.s b/gas/testsuite/gas/aarch64/trbe.s
new file mode 100644 (file)
index 0000000..bf48ed1
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/trbe.s
@@ -0,0 +1,16 @@
+/* Read from system register.  */
+mrs x0, trbbaser_el1
+mrs x0, trbidr_el1
+mrs x0, trblimitr_el1
+mrs x0, trbmar_el1
+mrs x0, trbptr_el1
+mrs x0, trbsr_el1
+mrs x0, trbtrg_el1
+
+/* Write to system register.  */
+msr trbbaser_el1, x0
+msr trblimitr_el1, x0
+msr trbmar_el1, x0
+msr trbptr_el1, x0
+msr trbsr_el1, x0
+msr trbtrg_el1, x0

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 307194dad5ef2ae492823c213ce1a9c749de7b72..291c52e54b860bc0226a73248bae9da52ba80b31 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-28  Przemyslaw Wirkus  <przemyslaw.wirkus@arm.com>
+
+        * aarch64-opc.c: Add TRBE system registers TRBIDR_EL1 , TRBBASER_EL1 ,
+        TRBLIMITR_EL1 , TRBMAR_EL1 , TRBPTR_EL1, TRBSR_EL1 and TRBTRG_EL1.
+
 2020-09-26  Alan Modra  <amodra@gmail.com>
 
        * csky-opc.h: Formatting.

diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c
index 22d69347946c4a7b37d07e632d9e57025ec26d23..1be8d21642be6cce1ecebb01e6147ea63fe209b8 100644 (file)
--- a/opcodes/aarch64-opc.c
+++ b/opcodes/aarch64-opc.c
@@ -4311,6 +4311,14 @@ const aarch64_sys_reg aarch64_sys_regs [] =
   SR_V8_R ("prselr_el2",       CPENC (3,4,C6,C2,1),    0),
   SR_V8_R ("vsctlr_el2",       CPENC (3,4,C2,C0,0),    0),
 
+  SR_CORE("trbbaser_el1",      CPENC (3,0,C9,C11,2),   0),
+  SR_CORE("trbidr_el1",        CPENC (3,0,C9,C11,7),   F_REG_READ),
+  SR_CORE("trblimitr_el1",     CPENC (3,0,C9,C11,0),   0),
+  SR_CORE("trbmar_el1",        CPENC (3,0,C9,C11,4),   0),
+  SR_CORE("trbptr_el1",        CPENC (3,0,C9,C11,1),   0),
+  SR_CORE("trbsr_el1",         CPENC (3,0,C9,C11,3),   0),
+  SR_CORE("trbtrg_el1",        CPENC (3,0,C9,C11,6),   0),
+
   { 0, CPENC (0,0,0,0,0), 0, 0 }
 };