2006-03-21 Paul Brook <paul@codesourcery.com>

gas/
	* config/tc-arm.c (insns): Correct opcodes for ldrbt and strbt.
gas/testsuite/
	* gas/arm/thumb32.d: Correct expected output.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 53f3bb25131cd017100861ff5b296af2036b365a..5d39cb6858297c007cd978079e8dca1f15581c3d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-21  Paul Brook  <paul@codesourcery.com>
+
+       * config/tc-arm.c (insns): Correct opcodes for ldrbt and strbt.
+
 2006-03-20  Paul Brook  <paul@codesourcery.com>
 
        * config/tc-arm.c (BAD_BRANCH, BAD_NOT_IT): Define.

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 583acf27ba53a8540d6b660a7bdd0775c354326c..876eb5d51d012253b31a0a6c81ff78cc2c38b05b 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -9034,9 +9034,9 @@ static const struct asm_opcode insns[] =
   CL(teqp,     130f000,           2, (RR, SH),      cmp),
 
  TC3(ldrt,     4300000, f8500e00, 2, (RR, ADDR),    ldstt, t_ldstt),
- TC3(ldrbt,    4700000, f8300e00, 2, (RR, ADDR),    ldstt, t_ldstt),
+ TC3(ldrbt,    4700000, f8100e00, 2, (RR, ADDR),    ldstt, t_ldstt),
  TC3(strt,     4200000, f8400e00, 2, (RR, ADDR),    ldstt, t_ldstt),
- TC3(strbt,    4600000, f8200e00, 2, (RR, ADDR),    ldstt, t_ldstt),
+ TC3(strbt,    4600000, f8000e00, 2, (RR, ADDR),    ldstt, t_ldstt),
 
  TC3(stmdb,    9000000, e9000000, 2, (RRw, REGLST), ldmstm, t_ldmstm),
  TC3(stmfd,     9000000, e9000000, 2, (RRw, REGLST), ldmstm, t_ldmstm),

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index cde23291605f941190d8aaa3357754cc0d51e14d..b47b13e9c1f11df81100c7459142669a4dcfe876 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-21  Paul Brook  <paul@codesourcery.com>
+
+       * gas/arm/thumb32.d: Correct expected output.
+
 2006-03-20  Paul Brook  <paul@codesourcery.com>
 
        * gas/arm/thumb2_bcond.d: New test.

diff --git a/gas/testsuite/gas/arm/thumb32.d b/gas/testsuite/gas/arm/thumb32.d
index ae2ebf7f43404a8f287354d22390d7553e601899..2977779aefdd2ac66d51661f7bbfd598f772d913 100644 (file)
--- a/gas/testsuite/gas/arm/thumb32.d
+++ b/gas/testsuite/gas/arm/thumb32.d
@@ -523,8 +523,8 @@ Disassembly of section .text:
 0[0-9a-f]+ <[^>]+> e9c5 2300   strd    r2, r3, \[r5\]
 0[0-9a-f]+ <[^>]+> e9c5 230c   strd    r2, r3, \[r5, #48\]
 0[0-9a-f]+ <[^>]+> e945 230c   strd    r2, r3, \[r5, #-48\]
-0[0-9a-f]+ <[^>]+> f835 1e00   ldrht   r1, \[r5\]
-0[0-9a-f]+ <[^>]+> f835 1e30   ldrht   r1, \[r5, #48\]
+0[0-9a-f]+ <[^>]+> f815 1e00   ldrbt   r1, \[r5\]
+0[0-9a-f]+ <[^>]+> f815 1e30   ldrbt   r1, \[r5, #48\]
 0[0-9a-f]+ <[^>]+> f915 1e00   ldrsbt  r1, \[r5\]
 0[0-9a-f]+ <[^>]+> f915 1e30   ldrsbt  r1, \[r5, #48\]
 0[0-9a-f]+ <[^>]+> f835 1e00   ldrht   r1, \[r5\]