opcodes/

	* m68k-opc.c (m68k_opcodes): Correct move sr and ccr masks for
	coldfire.

	gas/testsuite/
	* gas/m68k/mcf-movsr.s: New.
	* gas/m68k/mcf-movsr.d: New.
	* gas/m68k/all.exp: Add mcf-movsr test.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b1b06681f3826cc086a0e27d2b09d1af81ea0ed4..c180bea02bc52f6f6c2ab1792c752e9ef5483aa7 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-17  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * gas/m68k/mcf-movsr.s: New.
+       * gas/m68k/mcf-movsr.d: New.
+       * gas/m68k/all.exp: Add mcf-movsr test.
+
 2007-10-16  Nick Clifton  <nickc@redhat.com>
 
        * gas/elf/elf.exp: Accept COMMON in readelf's output.

diff --git a/gas/testsuite/gas/m68k/all.exp b/gas/testsuite/gas/m68k/all.exp
index ae9f993b7e41db315619fd8e2ef883d31fa258ca..0dcf29eb1cd9e9c85b59053acada6c99d81c9471 100644 (file)
--- a/gas/testsuite/gas/m68k/all.exp
+++ b/gas/testsuite/gas/m68k/all.exp
@@ -49,6 +49,7 @@ if { [istarget m68*-*-*] || [istarget fido*-*-*] } then {
     }
 
     run_dump_test mcf-mov3q
+    run_dump_test mcf-movsr
     run_dump_test mode5
     run_dump_test mcf-mac
     run_dump_test mcf-emac

diff --git a/gas/testsuite/gas/m68k/mcf-movsr.d b/gas/testsuite/gas/m68k/mcf-movsr.d
new file mode 100644 (file)
index 0000000..494413a
--- /dev/null
+++ b/gas/testsuite/gas/m68k/mcf-movsr.d
@@ -0,0 +1,15 @@
+#name: mcf-movsr
+#objdump: -d
+#as: -mcpu=5329
+
+.*:     file format .*
+
+Disassembly of section .text:
+
+0+ <test_movsr>:
+   0:  46c3            movew %d3,%sr
+   2:  46fc ffff       movew #-1,%sr
+   6:  40c3            movew %sr,%d3
+   8:  44c3            movew %d3,%ccr
+   a:  44fc ffff       movew #-1,%ccr
+   e:  42c3            movew %ccr,%d3

diff --git a/gas/testsuite/gas/m68k/mcf-movsr.s b/gas/testsuite/gas/m68k/mcf-movsr.s
new file mode 100644 (file)
index 0000000..32c9ecb
--- /dev/null
+++ b/gas/testsuite/gas/m68k/mcf-movsr.s
@@ -0,0 +1,13 @@
+.text
+|*****************************************************************
+| Test all permutations of movew sr and movew ccr
+|*****************************************************************
+       .global test_movsr
+test_movsr:
+       move.w  %d3,%sr                 | Mode 0
+       move.w  #-1,%sr                 | Mode 7.4
+       move.w  %sr,%d3                 | Mode 0
+
+       move.w  %d3,%ccr                | Mode 0
+       move.w  #-1,%ccr                | Mode 7.4
+       move.w  %ccr,%d3                | Mode 0

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d9f7c9d08bc1c2b6a44ba459fcb7c332ce6b74e7..a4d3f1ae489fe1b16b9ddbd2ade0867902bfe93e 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-17  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * m68k-opc.c (m68k_opcodes): Correct move sr and ccr masks for
+       coldfire.
+
 2007-10-15  Peter Bergner  <bergner@vnet.ibm.com>
 
        * ppc-opc.c (powerpc_opcodes): Fix the first two operands of

diff --git a/opcodes/m68k-opc.c b/opcodes/m68k-opc.c
index 0094dab0971b84d1f5a79f2d6baa7cfe0a6d7e67..e3b7a455ae955a9ab2fb7a446fa8a21d5c5ee354 100644 (file)
--- a/opcodes/m68k-opc.c
+++ b/opcodes/m68k-opc.c
@@ -1593,10 +1593,10 @@ const struct m68k_opcode m68k_opcodes[] =
 {"movew", 2,   one(0041300),   one(0177700), "Cs$s", m68010up },
 {"movew", 2,   one(0041300),   one(0177770), "CsDs", mcfisa_a },
 {"movew", 2,   one(0042300),   one(0177700), ";wCd", m68000up },
-{"movew", 2,   one(0042300),   one(0177700), "DsCd", mcfisa_a },
+{"movew", 2,   one(0042300),   one(0177770), "DsCd", mcfisa_a },
 {"movew", 4,   one(0042374),   one(0177777), "#wCd", mcfisa_a },
 {"movew", 2,   one(0043300),   one(0177700), ";wSd", m68000up },
-{"movew", 2,   one(0043300),   one(0177700), "DsSd", mcfisa_a },
+{"movew", 2,   one(0043300),   one(0177770), "DsSd", mcfisa_a },
 {"movew", 4,   one(0043374),   one(0177777), "#wSd", mcfisa_a },
 
 {"movel", 2,   one(0070000),   one(0170400), "MsDd", m68000up | mcfisa_a },