* gas/arm/addthumb2err.s: New test file.

	* gas/arm/addthumb2err.d: Test control file.
	* gas/arm/addthumb2err.l: Expected error messages.

	* config/tc-arm.c (do_t_add_sub): Only allow LSL shifts of less
	than 4 in Thumb mode.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2bde415945ff287620b1f07aad8b5a524ab0d18f..3b833c8ccb4e909690f793837132efb12161cc0a 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-30  Paul Carroll  <pcarroll@codesourcery.com>
+
+       * config/tc-arm.c (do_t_add_sub): Only allow LSL shifts of less
+       than 4 in Thumb mode.
+
 2011-06-30  Nick Clifton  <nickc@redhat.com>
 
        PR gas/12848

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index fca5483ceb8afca656c3bbb4f9186abe08ae267f..15923228bbf9d1b8de849714304182fd3f1dce96 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -9474,6 +9474,9 @@ do_t_add_sub (void)
        }
       else
        {
+         unsigned int value = inst.reloc.exp.X_add_number;
+         unsigned int shift = inst.operands[2].shift_kind;
+
          Rn = inst.operands[2].reg;
          /* See if we can do this with a 16-bit instruction.  */
          if (!inst.operands[2].shifted && inst.size_req != 4)
@@ -9524,6 +9527,10 @@ do_t_add_sub (void)
          inst.instruction = THUMB_OP32 (inst.instruction);
          inst.instruction |= Rd << 8;
          inst.instruction |= Rs << 16;
+         constraint (Rd == REG_SP && Rs == REG_SP && value > 3,
+                     _("shift value over 3 not allowed in thumb mode"));
+         constraint (Rd == REG_SP && Rs == REG_SP && shift != SHIFT_LSL,
+                     _("only LSL shift allowed in thumb mode"));
          encode_thumb32_shifted_operand (2);
        }
     }

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 3999422e1de5a070c38ea232b66f78bbb5f92a7c..c5408b85de34eb441904c88520c5142d3f72c140 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-30  Paul Carroll  <pcarroll@codesourcery.com>
+
+       * gas/arm/addthumb2err.s: New test file.
+       * gas/arm/addthumb2err.d: Test control file.
+       * gas/arm/addthumb2err.l: Expected error messages.
+
 2011-06-30  Nick Clifton  <nickc@redhat.com>
 
        PR gas/12931

diff --git a/gas/testsuite/gas/arm/addthumb2err.d b/gas/testsuite/gas/arm/addthumb2err.d
new file mode 100644 (file)
index 0000000..46532f3
--- /dev/null
+++ b/gas/testsuite/gas/arm/addthumb2err.d
@@ -0,0 +1,7 @@
+#name: bad Thumb2 Add{S} and Sub{S} instructions
+#as: -march=armv7-a
+#error-output: addthumb2err.l
+
+# Test some Thumb2 instructions:
+
+.*: +file format .*arm.*

diff --git a/gas/testsuite/gas/arm/addthumb2err.l b/gas/testsuite/gas/arm/addthumb2err.l
new file mode 100644 (file)
index 0000000..c77d551
--- /dev/null
+++ b/gas/testsuite/gas/arm/addthumb2err.l
@@ -0,0 +1,21 @@
+[^:]*: Assembler messages:
+[^:]*:9: Error: shift value over 3 not allowed in thumb mode -- `add sp,sp,r0,LSL#4'
+[^:]*:10: Error: only LSL shift allowed in thumb mode -- `add sp,sp,r0,LSR#3'
+[^:]*:11: Error: only LSL shift allowed in thumb mode -- `add sp,sp,r0,ASR#3'
+[^:]*:12: Error: only LSL shift allowed in thumb mode -- `add sp,sp,r0,ROR#3'
+[^:]*:13: Error: only LSL shift allowed in thumb mode -- `add sp,sp,r0,RRX'
+[^:]*:14: Error: shift value over 3 not allowed in thumb mode -- `adds sp,sp,r0,LSL#4'
+[^:]*:15: Error: only LSL shift allowed in thumb mode -- `adds sp,sp,r0,LSR#3'
+[^:]*:16: Error: only LSL shift allowed in thumb mode -- `adds sp,sp,r0,ASR#3'
+[^:]*:17: Error: only LSL shift allowed in thumb mode -- `adds sp,sp,r0,ROR#3'
+[^:]*:18: Error: only LSL shift allowed in thumb mode -- `adds sp,sp,r0,RRX'
+[^:]*:19: Error: shift value over 3 not allowed in thumb mode -- `sub sp,sp,r0,LSL#4'
+[^:]*:20: Error: only LSL shift allowed in thumb mode -- `sub sp,sp,r0,LSR#3'
+[^:]*:21: Error: only LSL shift allowed in thumb mode -- `sub sp,sp,r0,ASR#3'
+[^:]*:22: Error: only LSL shift allowed in thumb mode -- `sub sp,sp,r0,ROR#3'
+[^:]*:23: Error: only LSL shift allowed in thumb mode -- `sub sp,sp,r0,RRX'
+[^:]*:24: Error: shift value over 3 not allowed in thumb mode -- `subs sp,sp,r0,LSL#4'
+[^:]*:25: Error: only LSL shift allowed in thumb mode -- `subs sp,sp,r0,LSR#3'
+[^:]*:26: Error: only LSL shift allowed in thumb mode -- `subs sp,sp,r0,ASR#3'
+[^:]*:27: Error: only LSL shift allowed in thumb mode -- `subs sp,sp,r0,ROR#3'
+[^:]*:28: Error: only LSL shift allowed in thumb mode -- `subs sp,sp,r0,RRX'

diff --git a/gas/testsuite/gas/arm/addthumb2err.s b/gas/testsuite/gas/arm/addthumb2err.s
new file mode 100644 (file)
index 0000000..139c195
--- /dev/null
+++ b/gas/testsuite/gas/arm/addthumb2err.s
@@ -0,0 +1,28 @@
+       .syntax unified
+       .text
+       .align  2
+       .thumb
+
+       # Test of invalid operands for ADD{S} and SUB{S} instructions
+       # in Thumb2 mode.  The instruction form being testing
+       # involves having the first 2 operands be SP.
+       add sp, sp, r0, LSL #4
+       add sp, sp, r0, LSR #3
+       add sp, sp, r0, ASR #3
+       add sp, sp, r0, ROR #3
+       add sp, sp, r0, RRX
+       adds sp, sp, r0, LSL #4
+       adds sp, sp, r0, LSR #3
+       adds sp, sp, r0, ASR #3
+       adds sp, sp, r0, ROR #3
+       adds sp, sp, r0, RRX
+       sub sp, sp, r0, LSL #4
+       sub sp, sp, r0, LSR #3
+       sub sp, sp, r0, ASR #3
+       sub sp, sp, r0, ROR #3
+       sub sp, sp, r0, RRX
+       subs sp, sp, r0, LSL #4
+       subs sp, sp, r0, LSR #3
+       subs sp, sp, r0, ASR #3
+       subs sp, sp, r0, ROR #3
+       subs sp, sp, r0, RRX