Revert "Add support for ARMv8-M security extension"

This reverts commit d11ecca7f8fdbdf17a8850e9fd56ff6fa333adfa.

9 files changed, 28 insertions, 71 deletions

diff --git a/gas/ChangeLog.arm b/gas/ChangeLog.arm
index 6b05177640e..fc7fa6702cf 100644
--- a/gas/ChangeLog.arm
+++ b/gas/ChangeLog.arm
@@ -3,6 +3,14 @@
 	Revert
 	2015-12-17  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
+	* config/tc-arm.c (insns): Add ARMv8-M security extensions
+	instructions.
+
+2016-03-29  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+	Revert
+	2015-12-17  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
 	* config/tc-arm.c
 	(struct arm_option_extension_value_table): Make allowed_archs an array
 	with 2 entries.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 6f072e37490..3da7191e756 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -20551,13 +20551,8 @@ static const struct asm_opcode insns[] =
 #define ARM_VARIANT NULL
 #undef  THUMB_VARIANT
 #define THUMB_VARIANT & arm_ext_v8m
- TUE("sg", 0, e97fe97f, 0, (), 0, noargs),
- TUE("blxns", 0, 4784, 1, (RRnpc), 0, t_blx),
- TUE("bxns", 0, 4704, 1, (RRnpc), 0, t_bx),
  TUE("tt", 0, e840f000, 2, (RRnpc, RRnpc), 0, tt),
  TUE("ttt", 0, e840f040, 2, (RRnpc, RRnpc), 0, tt),
- TUE("tta", 0, e840f080, 2, (RRnpc, RRnpc), 0, tt),
- TUE("ttat", 0, e840f0c0, 2, (RRnpc, RRnpc), 0, tt),
 };
 #undef ARM_VARIANT
 #undef THUMB_VARIANT
diff --git a/gas/testsuite/ChangeLog.arm b/gas/testsuite/ChangeLog.arm
index 0e4f7e1706c..6c5eb03a427 100644
--- a/gas/testsuite/ChangeLog.arm
+++ b/gas/testsuite/ChangeLog.arm
@@ -3,6 +3,16 @@
 	Revert
 	2015-12-17  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
+	* gas/arm/any-cmse.d: Likewise.
+	* gas/arm/archv8m-cmse.s: New file.
+	* gas/arm/archv8m-cmse-base.d: Likewise.
+	* gas/arm/archv8m-cmse-main.d: Likewise.
+
+2016-03-29  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+	Revert
+	2015-12-17  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
 	* gas/arm/arch7em-bad.d: Rename to ...
 	* gas/arm/arch7em-bad-1.d: This.
 	* gas/arm/arch7em-bad-2.d: New file.
diff --git a/gas/testsuite/gas/arm/any-cmse.d b/gas/testsuite/gas/arm/any-cmse.d
deleted file mode 100644
index 212c43cc3b1..00000000000
--- a/gas/testsuite/gas/arm/any-cmse.d
+++ /dev/null
@@ -1,11 +0,0 @@
-#name: attributes for 'any' CPU with ARMv8-M security extension instructions
-#source: archv8m-cmse.s
-#as:
-#readelf: -A
-# target: *-*-*eabi* *-*-nacl*
-
-Attribute Section: aeabi
-File Attributes
-  Tag_CPU_arch: v8-M.baseline
-  Tag_CPU_arch_profile: Microcontroller
-  Tag_THUMB_ISA_use: Yes
diff --git a/gas/testsuite/gas/arm/archv8m-cmse-base.d b/gas/testsuite/gas/arm/archv8m-cmse-base.d
deleted file mode 100644
index 30141af12a8..00000000000
--- a/gas/testsuite/gas/arm/archv8m-cmse-base.d
+++ /dev/null
@@ -1,17 +0,0 @@
-#name: ARM V8-M baseline instructions
-#source: archv8m-cmse.s
-#as: -march=armv8-m.base
-#objdump: -dr --prefix-addresses --show-raw-insn
-
-.*: +file format .*arm.*
-
-Disassembly of section .text:
-0+.* <[^>]*> e97f e97f 	sg
-0+.* <[^>]*> 47a4      	blxns	r4
-0+.* <[^>]*> 47cc      	blxns	r9
-0+.* <[^>]*> 4724      	bxns	r4
-0+.* <[^>]*> 474c      	bxns	r9
-0+.* <[^>]*> e841 f080 	tta	r0, r1
-0+.* <[^>]*> e849 f880 	tta	r8, r9
-0+.* <[^>]*> e841 f0c0 	ttat	r0, r1
-0+.* <[^>]*> e849 f8c0 	ttat	r8, r9
diff --git a/gas/testsuite/gas/arm/archv8m-cmse-main.d b/gas/testsuite/gas/arm/archv8m-cmse-main.d
deleted file mode 100644
index cd6e6a2714d..00000000000
--- a/gas/testsuite/gas/arm/archv8m-cmse-main.d
+++ /dev/null
@@ -1,17 +0,0 @@
-#name: ARM V8-M mainline instructions
-#source: archv8m-cmse.s
-#as: -march=armv8-m.main
-#objdump: -dr --prefix-addresses --show-raw-insn
-
-.*: +file format .*arm.*
-
-Disassembly of section .text:
-0+.* <[^>]*> e97f e97f 	sg
-0+.* <[^>]*> 47a4      	blxns	r4
-0+.* <[^>]*> 47cc      	blxns	r9
-0+.* <[^>]*> 4724      	bxns	r4
-0+.* <[^>]*> 474c      	bxns	r9
-0+.* <[^>]*> e841 f080 	tta	r0, r1
-0+.* <[^>]*> e849 f880 	tta	r8, r9
-0+.* <[^>]*> e841 f0c0 	ttat	r0, r1
-0+.* <[^>]*> e849 f8c0 	ttat	r8, r9
diff --git a/gas/testsuite/gas/arm/archv8m-cmse.s b/gas/testsuite/gas/arm/archv8m-cmse.s
deleted file mode 100644
index 520550c8709..00000000000
--- a/gas/testsuite/gas/arm/archv8m-cmse.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.thumb
-.syntax unified
-
-sg
-blxns r4
-blxns r9
-bxns  r4
-bxns  r9
-tta   r0, r1
-tta   r8, r9
-ttat  r0, r1
-ttat  r8, r9
diff --git a/opcodes/ChangeLog.arm b/opcodes/ChangeLog.arm
index 6f58bcf496a..70d5d080b56 100644
--- a/opcodes/ChangeLog.arm
+++ b/opcodes/ChangeLog.arm
@@ -1,3 +1,13 @@
+2016-03-29  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+	Revert
+	2015-12-17  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+	* arm-dis.c (thumb_opcodes): Add entries for narrow ARMv8-M security
+	extensions instructions.
+	(thumb32_opcodes): Add entries for wide ARMv8-M security extensions
+	instructions.
+
 2015-12-17  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
 	* arm-dis.c (thumb_opcodes): Add entries for narrow ARMv8-M security
diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 3e8afdf2bc3..0e91b68176b 100644
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -2320,10 +2320,6 @@ static const struct opcode16 thumb_opcodes[] =
 {
   /* Thumb instructions.  */
 
-  /* ARM V8-M instructions.  */
-  {ARM_FEATURE_CORE_HIGH (ARM_EXT2_V8M), 0x4784, 0xff87, "blxns\t%3-6r"},
-  {ARM_FEATURE_CORE_HIGH (ARM_EXT2_V8M), 0x4704, 0xff07, "bxns\t%3-6r"},
-
   /* ARM V8 instructions.  */
   {ARM_FEATURE_CORE_LOW (ARM_EXT_V8),  0xbf50, 0xffff, "sevl%c"},
   {ARM_FEATURE_CORE_LOW (ARM_EXT_V8),  0xba80, 0xffc0, "hlt\t%0-5x"},
@@ -2530,15 +2526,10 @@ static const struct opcode16 thumb_opcodes[] =
 static const struct opcode32 thumb32_opcodes[] =
 {
   /* V8-M instructions.  */
-  {ARM_FEATURE_CORE_HIGH (ARM_EXT2_V8M), 0xe97fe97f, 0xffffffff, "sg"},
   {ARM_FEATURE_CORE_HIGH (ARM_EXT2_V8M),
     0xe840f000, 0xfff0f0ff, "tt\t%8-11r, %16-19r"},
   {ARM_FEATURE_CORE_HIGH (ARM_EXT2_V8M),
     0xe840f040, 0xfff0f0ff, "ttt\t%8-11r, %16-19r"},
-  {ARM_FEATURE_CORE_HIGH (ARM_EXT2_V8M),
-    0xe840f080, 0xfff0f0ff, "tta\t%8-11r, %16-19r"},
-  {ARM_FEATURE_CORE_HIGH (ARM_EXT2_V8M),
-    0xe840f0c0, 0xfff0f0ff, "ttat\t%8-11r, %16-19r"},
 
   /* V8 instructions.  */
   {ARM_FEATURE_CORE_LOW (ARM_EXT_V8),