2007-01-11 Paul Brook <paul@codesourcery.com>

	gas/
	* config/tc-arm.c (do_t_add_sub): Use Rd and Rs.

	gas/testsuite/
	* gas/arm/thumb2_add.d: Add test for missing operand.
	* gas/arm/thumb2_add.s: Ditto.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 21c8299..b3afb4b 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-11  Paul Brook  <paul@codesourcery.com>
+
+       * config/tc-arm.c (do_t_add_sub): Use Rd and Rs.
+
 2007-01-11  Nick Clifton  <nickc@redhat.com>
 
        PR gas/3707

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 6a2756d..4f341cb 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -8414,8 +8414,8 @@ do_t_add_sub (void)
                  else
                    inst.reloc.type = BFD_RELOC_ARM_T32_ADD_IMM;
                }
-             inst.instruction |= inst.operands[0].reg << 8;
-             inst.instruction |= inst.operands[1].reg << 16;
+             inst.instruction |= Rd << 8;
+             inst.instruction |= Rs << 16;
            }
        }
       else

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 06360e9..6001e8e 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-11  Paul Brook  <paul@codesourcery.com>
+
+       * gas/arm/thumb2_add.d: Add test for missing operand.
+       * gas/arm/thumb2_add.s: Ditto.
+
 2007-01-11  Nick Clifton  <nickc@redhat.com>
 
        * gas/mcore/allinsn.s: Remove use of '#' before numbers - it is a

diff --git a/gas/testsuite/gas/arm/thumb2_add.d b/gas/testsuite/gas/arm/thumb2_add.d
index 6331acf..c63e5e6 100644 (file)
--- a/gas/testsuite/gas/arm/thumb2_add.d
+++ b/gas/testsuite/gas/arm/thumb2_add.d
@@ -16,3 +16,5 @@ Disassembly of section .text:
 0+024 <[^>]+> f5a9 6880        sub.w   r8, r9, #1024   ; 0x400
 0+028 <[^>]+> f2a9 1801        subw    r8, r9, #257    ; 0x101
 0+02c <[^>]+> f2a1 1301        subw    r3, r1, #257    ; 0x101
+0+030 <[^>]+> f103 0301        add.w   r3, r3, #1      ; 0x1
+0+034 <[^>]+> f1a3 0301        sub.w   r3, r3, #1      ; 0x1

diff --git a/gas/testsuite/gas/arm/thumb2_add.s b/gas/testsuite/gas/arm/thumb2_add.s
index c180386..70ab86c 100644 (file)
--- a/gas/testsuite/gas/arm/thumb2_add.s
+++ b/gas/testsuite/gas/arm/thumb2_add.s
@@ -17,3 +17,5 @@ thumb2_add:
        sub r8, r9, #0x400
        sub r8, r9, #0x101
        sub r3, r1, #0x101
+       add r3, #1
+       sub r3, #1