[AArch64][binutils] Add support for ARMv8.2 PSTATE.UAO.

ARMv8.2 adds a new control bit PSTATE.UAO. This patch adds support for
this bit to binutils, following the same basic pattern as for
PSTATE.PAN. The new control bit is only available when -march=armv8.2-a
is specified.

gas/testsuite/
2015-12-10  Matthew Wahab  <[email protected]>

	* gas/aarch64/uao-directive.d: New.
	* gas/aarch64/uao.d: New.
	* gas/aarch64/uao.s: New.

opcodes/
2015-12-10  Matthew Wahab  <[email protected]>

	* aarch64-opc.c (aarch64_sys_regs): Add "uao".
	(aarch64_sys_reg_supported_p): Add comment.  Add checks for "uao".
	(aarch64_pstatefields): Add "uao".
	(aarch64_pstatefield_supported_p): Add checks for "uao".

Change-Id: Id571628ac5227b78aaf1876e85d15d7b6c0a2896

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index dd4a44a7ed1f7823a6a59f9d267f12e7d0a4797c..aecac6a680eaf117d9e4dcb4d45a879547bc92cd 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-10  Matthew Wahab  <[email protected]>
+
+       * gas/aarch64/uao-directive.d: New.
+       * gas/aarch64/uao.d: New.
+       * gas/aarch64/uao.s: New.
+

 2015-12-10  Matthew Wahab  <[email protected]>
 
        * gas/aarch64/sysreg-2.d: Add tests for new registers.
 2015-12-10  Matthew Wahab  <[email protected]>
 
        * gas/aarch64/sysreg-2.d: Add tests for new registers.

diff --git a/gas/testsuite/gas/aarch64/uao-directive.d b/gas/testsuite/gas/aarch64/uao-directive.d
new file mode 100644 (file)
index 0000000..72569e5
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/uao-directive.d
@@ -0,0 +1,13 @@
+#objdump: -dr
+#as: --defsym DIRECTIVE=1
+#source: uao.s
+
+.*:     file format .*
+
+Disassembly of section \.text:
+
+0000000000000000 <.*>:
+   [0-9a-f]:+  d500417f        msr     uao, #0x1
+   [0-9a-f]:+  d500407f        msr     uao, #0x0
+   [0-9a-f]:+  d5184280        msr     uao, x0
+   [0-9a-f]:+  d5384281        mrs     x1, uao

diff --git a/gas/testsuite/gas/aarch64/uao.d b/gas/testsuite/gas/aarch64/uao.d
new file mode 100644 (file)
index 0000000..49ec413
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/uao.d
@@ -0,0 +1,12 @@
+#objdump: -dr
+#as: -march=armv8.2-a
+
+.*:     file format .*
+
+Disassembly of section \.text:
+
+0000000000000000 <.*>:
+   [0-9a-f]:+  d500417f        msr     uao, #0x1
+   [0-9a-f]:+  d500407f        msr     uao, #0x0
+   [0-9a-f]:+  d5184280        msr     uao, x0
+   [0-9a-f]:+  d5384281        mrs     x1, uao

diff --git a/gas/testsuite/gas/aarch64/uao.s b/gas/testsuite/gas/aarch64/uao.s
new file mode 100644 (file)
index 0000000..c4baa2c
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/uao.s
@@ -0,0 +1,32 @@
+/* uao.s Test file for AArch64 UAO instructions.
+
+   Copyright (C) 2015 Free Software Foundation, Inc.
+   Contributed by ARM Ltd.
+
+   This file is part of GAS.
+
+   GAS is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the license, or
+   (at your option) any later version.
+
+   GAS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING3.  If not,
+   see <http://www.gnu.org/licenses/>.  */
+
+
+       .text
+       .ifdef DIRECTIVE
+       .arch armv8.2-a
+       .endif
+
+       msr uao, #1
+       msr uao, #0
+
+       msr uao, x0
+       mrs x1, uao

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 8b5903271f3a68a770dfc5bb65c5d027c0f59699..df76c5638da8b9bf2aed36550b363a3e6889bb30 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-10  Matthew Wahab  <[email protected]>
+
+       * aarch64-opc.c (aarch64_sys_regs): Add "uao".
+       (aarch64_sys_reg_supported_p): Add comment.  Add checks for "uao".
+       (aarch64_pstatefields): Add "uao".
+       (aarch64_pstatefield_supported_p): Add checks for "uao".
+

 2015-12-10  Matthew Wahab  <[email protected]>
 
        * aarch64-opc.c (aarch64_sys_regs): Add "vsesr_el2", "erridr_el1",
 2015-12-10  Matthew Wahab  <[email protected]>
 
        * aarch64-opc.c (aarch64_sys_regs): Add "vsesr_el2", "erridr_el1",

diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c
index 0c1d17da2be24cbe375ec12d1e6fbb0e91370d1d..7477a38064a84dca96613855662517b39a2a6b4f 100644 (file)
--- a/opcodes/aarch64-opc.c
+++ b/opcodes/aarch64-opc.c
@@ -2771,6 +2771,7 @@ const aarch64_sys_reg aarch64_sys_regs [] =
   { "daif",             CPEN_(3,C2,1), 0 },
   { "currentel",        CPEN_(0,C2,2), 0 }, /* RO */
   { "pan",             CPEN_(0,C2,3),  F_ARCHEXT },
   { "daif",             CPEN_(3,C2,1), 0 },
   { "currentel",        CPEN_(0,C2,2), 0 }, /* RO */
   { "pan",             CPEN_(0,C2,3),  F_ARCHEXT },

+  { "uao",             CPEN_ (0, C2, 4), F_ARCHEXT },

   { "nzcv",             CPEN_(3,C2,0), 0 },
   { "fpcr",             CPEN_(3,C4,0), 0 },
   { "fpsr",             CPEN_(3,C4,1), 0 },
   { "nzcv",             CPEN_(3,C2,0), 0 },
   { "fpcr",             CPEN_(3,C4,0), 0 },
   { "fpsr",             CPEN_(3,C4,1), 0 },


@@ -3169,10 +3170,17 @@ aarch64_sys_reg_supported_p (const aarch64_feature_set features,
       && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_1))
 
   /* ARMv8.2 features.  */
       && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_1))
 
   /* ARMv8.2 features.  */

+
+  /* ID_AA64MMFR2_EL1.  */

   if (reg->value == CPENC (3, 0, C0, C7, 2)
       && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_2))
     return FALSE;
 
   if (reg->value == CPENC (3, 0, C0, C7, 2)
       && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_2))
     return FALSE;
 

+  /* PSTATE.UAO.  */
+  if (reg->value == CPEN_ (0, C2, 4)
+      && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_2))
+    return FALSE;
+

   /* RAS extension.  */
 
   /* ERRIDR_EL1 and ERRSELR_EL1.  */
   /* RAS extension.  */
 
   /* ERRIDR_EL1 and ERRSELR_EL1.  */


@@ -3208,6 +3216,7 @@ const aarch64_sys_reg aarch64_pstatefields [] =
   { "daifset",          0x1e,  0 },
   { "daifclr",          0x1f,  0 },
   { "pan",             0x04,   F_ARCHEXT },
   { "daifset",          0x1e,  0 },
   { "daifclr",          0x1f,  0 },
   { "pan",             0x04,   F_ARCHEXT },

+  { "uao",             0x03,   F_ARCHEXT },

   { 0,          CPENC(0,0,0,0,0), 0 },
 };
 
   { 0,          CPENC(0,0,0,0,0), 0 },
 };
 


@@ -3223,6 +3232,11 @@ aarch64_pstatefield_supported_p (const aarch64_feature_set features,
       && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_PAN))
     return FALSE;
 
       && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_PAN))
     return FALSE;
 

+  /* UAO.  Values are from aarch64_pstatefields.  */
+  if (reg->value == 0x03
+      && !AARCH64_CPU_HAS_FEATURE (features, AARCH64_FEATURE_V8_2))
+    return FALSE;
+

   return TRUE;
 }
 
   return TRUE;
 }