* gas/testsuite/gas/m68k/all.exp: Run "mode5" test also with -mcpu=5200.

* gas/testsuite/gas/m68k/mode5.s: Add moveml testcases.
* gas/testsuite/gas/m68k/mode5.d: Update.

* opcodes/m68k-opc.c: Use "y" in moveml pattern for mcfisa_a.

6 files changed, 20 insertions, 10 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e1af12a5f9..2a70ae7db6 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* gas/m68k/all.exp: Run "mode5" test also with -mcpu=5200.
+	* gas/m68k/mode5.s: Add moveml testcases.
+	* gas/m68k/mode5.d: Update.
+
 2011-09-05  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* gas/mips/loc-swap-2.s, gas/mips/loc-swap-2.d,
diff --git a/gas/testsuite/gas/m68k/all.exp b/gas/testsuite/gas/m68k/all.exp
index b3db085a67..bf06d4e7fc 100644
--- a/gas/testsuite/gas/m68k/all.exp
+++ b/gas/testsuite/gas/m68k/all.exp
@@ -51,6 +51,7 @@ if { [istarget m68*-*-*] || [istarget fido*-*-*] } then {
     run_dump_test mcf-mov3q
     run_dump_test mcf-movsr
     run_dump_test mode5
+    run_dump_test mode5 "{name {cf}} {as {-mcpu=5200}}"
     run_dump_test mcf-mac
     run_dump_test mcf-emac
     run_dump_test mcf-coproc
diff --git a/gas/testsuite/gas/m68k/mode5.d b/gas/testsuite/gas/m68k/mode5.d
index b51346b7b5..2de2c6adc4 100644
--- a/gas/testsuite/gas/m68k/mode5.d
+++ b/gas/testsuite/gas/m68k/mode5.d
@@ -10,4 +10,6 @@ Disassembly of section .text:
    0:	2213           	movel %a3@,%d1
    2:	2882           	movel %d2,%a4@
    4:	2295           	movel %a5@,%a1@
+   6:	4cd6 00ff      	moveml %fp@,%d0-%d7
+   a:	48d6 00ff      	moveml %d0-%d7,%fp@
 	...
diff --git a/gas/testsuite/gas/m68k/mode5.s b/gas/testsuite/gas/m68k/mode5.s
index 27c95d90f9..6a08f1b987 100644
--- a/gas/testsuite/gas/m68k/mode5.s
+++ b/gas/testsuite/gas/m68k/mode5.s
@@ -4,4 +4,6 @@
 	move.l 0(%a3),%d1
 	move.l %d2,0(%a4)
 	move.l 0(%a5),0(%a1)
+	movem.l 0(%a6),%d0-%d7
+	movem.l %d0-%d7,0(%a6)
 	.p2align 4
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 656d1ac4e4..3f11e668c3 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* m68k-opc.c: Use "y" in moveml pattern for mcfisa_a.
+
 2011-08-26  Nick Clifton  <nickc@redhat.com>
 
 	* po/es.po: Updated Spanish translation.
diff --git a/opcodes/m68k-opc.c b/opcodes/m68k-opc.c
index 0f6852f147..9463668976 100644
--- a/opcodes/m68k-opc.c
+++ b/opcodes/m68k-opc.c
@@ -1,6 +1,6 @@
 /* Opcode table for m680[012346]0/m6888[12]/m68851/mcf5200.
    Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2003, 2004, 2005, 2006, 2007, 2009, 2010
+   2000, 2001, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of the GNU opcodes library.
@@ -1553,15 +1553,10 @@ const struct m68k_opcode m68k_opcodes[] =
 {"moveml", 4,	one(0044300),	one(0177700), "#w>s", m68000up },
 {"moveml", 4,	one(0046300),	one(0177700), "<sLw", m68000up },
 {"moveml", 4,	one(0046300),	one(0177700), "<s#w", m68000up },
-/* FIXME: need specifier for mode 2 and 5 to simplify below insn patterns.  */
-{"moveml", 4,	one(0044320),	one(0177770), "Lwas", mcfisa_a },
-{"moveml", 4,	one(0044320),	one(0177770), "#was", mcfisa_a },
-{"moveml", 4,	one(0044350),	one(0177770), "Lwds", mcfisa_a },
-{"moveml", 4,	one(0044350),	one(0177770), "#wds", mcfisa_a },
-{"moveml", 4,	one(0046320),	one(0177770), "asLw", mcfisa_a },
-{"moveml", 4,	one(0046320),	one(0177770), "as#w", mcfisa_a },
-{"moveml", 4,	one(0046350),	one(0177770), "dsLw", mcfisa_a },
-{"moveml", 4,	one(0046350),	one(0177770), "ds#w", mcfisa_a },
+{"moveml", 4,	one(0044320),	one(0177770), "Lwys", mcfisa_a },
+{"moveml", 4,	one(0044320),	one(0177770), "#wys", mcfisa_a },
+{"moveml", 4,	one(0046320),	one(0177770), "ysLw", mcfisa_a },
+{"moveml", 4,	one(0046320),	one(0177770), "ys#w", mcfisa_a },
 
 {"movepw", 2,	one(0000410),	one(0170770), "dsDd", m68000up },
 {"movepw", 2,	one(0000610),	one(0170770), "Ddds", m68000up },