gas/ARM: Misses deprecated IT instruction warning for ARMv8

  Add sp increment and decrement to ARMv8 IT block deprecate
  pattern.

  gas/
    * config/tc-arm.c (depr_it_insns): New check for inc/dec sp.

  gas/testsuite/
    * gas/arm/armv8-a-it-bad.s: New check for inc/dec sp.
    * gas/arm/armv8-a-it-bad.l: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9e3a320b40dfc9076c5140f6f0bd4005831dc6dd..34fd665574d7c40974eb81016db42724fefea69f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-17 Jiong Wang <jiong.wang@arm.com>
+
+       * config/tc-arm.c (depr_it_insns): New check for inc/dec sp.
+
 2014-06-17  Hans-Peter Nilsson  <hp@axis.com>
 
        * config/tc-cris.c (cris_bad): New function.

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index fc86db4e070e333e35eabbde3bf23b3a415ffa0b..ce0532b17c204608adbf250dbd724c56f6bc8ee7 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -17266,6 +17266,9 @@ static const struct depr_insn_mask depr_it_insns[] = {
   { 0x4800, 0xf800, N_("Literal loads") },
   { 0x4478, 0xf478, N_("Hi-register ADD, MOV, CMP, BX, BLX using pc") },
   { 0x4487, 0xfc87, N_("Hi-register ADD, MOV, CMP using pc") },
+  /* NOTE: 0x00dd is not the real encoding, instead, it is the 'tvalue'
+     field in asm_opcode. 'tvalue' is used at the stage this check happen.  */
+  { 0x00dd, 0x7fff, N_("ADD/SUB sp, sp #imm") },
   { 0, 0, NULL }
 };
 

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b2d7af98136bf3d863c372802d868c29058c22dd..87b9823e6e0854579db0d421b72c4a3f1a10d60c 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-17  Jiong Wang  <jiong.wang@arm.com>
+
+       * gas/arm/armv8-a-it-bad.s: New check for deprecated sp_inc/dec within
+       IT block for ARMv8.
+       * gas/arm/armv8-a-it-bad.l: Likewise.
+
 2014-06-17  Hans-Peter Nilsson  <hp@axis.com>
 
        * gas/cris/range-err-3.s: New test.

diff --git a/gas/testsuite/gas/arm/armv8-a-it-bad.l b/gas/testsuite/gas/arm/armv8-a-it-bad.l
index e3a5971fe2ba9b4f1d7f8b011a5f3bf787f68e59..282216e41ed2503a781f7511a8f5aa4288754950 100644 (file)
--- a/gas/testsuite/gas/arm/armv8-a-it-bad.l
+++ b/gas/testsuite/gas/arm/armv8-a-it-bad.l
@@ -12,3 +12,7 @@
 .*:55: Error: r15 not allowed here -- `addeq r0,pc,pc'
 .*:58: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: Short branches, Undefined, SVC, LDM/STM
 .*:58: Error: r15 not allowed here -- `addeq pc,r0,r0'
+.*:61: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
+.*:65: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
+.*:68: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm
+.*:72: Warning: IT blocks containing 16-bit Thumb instructions of the following class are deprecated in ARMv8: ADD/SUB sp, sp #imm

diff --git a/gas/testsuite/gas/arm/armv8-a-it-bad.s b/gas/testsuite/gas/arm/armv8-a-it-bad.s
index 42f2b86b190959e6db7f919349f45a9fa03b3cc0..d1bc07a35750627119b0b923596eff7c215f6d06 100644 (file)
--- a/gas/testsuite/gas/arm/armv8-a-it-bad.s
+++ b/gas/testsuite/gas/arm/armv8-a-it-bad.s
@@ -56,3 +56,17 @@ addeq r0, pc, pc
 
 it eq
 addeq pc, r0, r0
+
+it eq
+addeq sp, sp, #12
+
+@ Misaligned immediate.
+it eq
+addeq sp, sp, #3
+
+it eq
+subeq sp, sp, #12
+
+@ Misaligned immediate.
+it eq
+subeq sp, sp, #3