opcodes/

    * m68k-opc.c (m68k_opcodes): Fix entries for ColdFire moveml.

    gas/testsuite/
    * gas/m68k/all.exp (movem-offset): Add test.
    * gas/m68k/movem-offset.s: New test.
    * gas/m68k/movem-offset.d: New.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 605dd333e24e88fdcac2e7ab87cc94dc7f37a3f5..6c4e38fd483857d605c4d4c49f0463f15d8722ce 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-24  Julian Brown  <julian@codesourcery.com>
+
+       * gas/m68k/all.exp (movem-offset): Add test.
+       * gas/m68k/movem-offset.s: New test.
+       * gas/m68k/movem-offset.d: New.
+
 2011-10-21  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
        * gas/s390/zarch-z10.d: Add CPUMF instructions.

diff --git a/gas/testsuite/gas/m68k/all.exp b/gas/testsuite/gas/m68k/all.exp
index bf06d4e7fcfac10bbf268c8d2b1408e28767a7a7..60352862d54a575ffb39dc6443efa78cc2172587 100644 (file)
--- a/gas/testsuite/gas/m68k/all.exp
+++ b/gas/testsuite/gas/m68k/all.exp
@@ -52,6 +52,8 @@ if { [istarget m68*-*-*] || [istarget fido*-*-*] } then {
     run_dump_test mcf-movsr
     run_dump_test mode5
     run_dump_test mode5 "{name {cf}} {as {-mcpu=5200}}"
+    run_dump_test movem-offset
+    run_dump_test movem-offset "{name {cf}} {as {-mcpu=5485}}"
     run_dump_test mcf-mac
     run_dump_test mcf-emac
     run_dump_test mcf-coproc

diff --git a/gas/testsuite/gas/m68k/movem-offset.d b/gas/testsuite/gas/m68k/movem-offset.d
new file mode 100644 (file)
index 0000000..6d2769c
--- /dev/null
+++ b/gas/testsuite/gas/m68k/movem-offset.d
@@ -0,0 +1,14 @@
+#name: movem-offset
+#objdump: -d
+#as: 
+
+.*:     file format .*
+
+Disassembly of section \.text:
+
+0+ <.text>:
+   0:  4cee 047c ffe8  moveml %fp@\(-24\),%d2-%d6/%a2
+   6:  48ee 047c 0010  moveml %d2-%d6/%a2,%fp@\(16\)
+   c:  4cee 03ff ffe8  moveml %fp@\(-24\),%d0-%a1
+  12:  48ee 03ff 0010  moveml %d0-%a1,%fp@\(16\)
+       \.\.\.

diff --git a/gas/testsuite/gas/m68k/movem-offset.s b/gas/testsuite/gas/m68k/movem-offset.s
new file mode 100644 (file)
index 0000000..f5f317d
--- /dev/null
+++ b/gas/testsuite/gas/m68k/movem-offset.s
@@ -0,0 +1,8 @@
+
+       | Check that non-zero displacements work for movem.
+       .text
+       movem.l -24(%a6),#1148
+       movem.l #1148,16(%a6)
+       movem.l -24(%a6),%d0-%d7/%a0-%a1
+       movem.l %d0-%d7/%a0-%a1,16(%a6)
+       .p2align 4

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 2d4989c9ce685fd6701093100ad2d3438d228bb8..0158cf19add6ee48d5cd8fa64989bc1219907f9d 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-24  Julian Brown  <julian@codesourcery.com>
+
+       * m68k-opc.c (m68k_opcodes): Fix entries for ColdFire moveml.
+
 2011-10-21  Jan Glauber  <jang@linux.vnet.ibm.com>
 
        * s390-opc.txt: Add CPUMF instructions.

diff --git a/opcodes/m68k-opc.c b/opcodes/m68k-opc.c
index 946366897678ea96d42764ac8d5b593c5008f175..3c8310aa6eafd6ac7f60e520de2cc6213be071fc 100644 (file)
--- a/opcodes/m68k-opc.c
+++ b/opcodes/m68k-opc.c
@@ -1553,10 +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 },
-{"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 },
+{"moveml", 4,  one(0044300),   one(0177700), "Lwys", mcfisa_a },
+{"moveml", 4,  one(0044300),   one(0177700), "#wys", mcfisa_a },
+{"moveml", 4,  one(0046300),   one(0177700), "ysLw", mcfisa_a },
+{"moveml", 4,  one(0046300),   one(0177700), "ys#w", mcfisa_a },
 
 {"movepw", 2,  one(0000410),   one(0170770), "dsDd", m68000up },
 {"movepw", 2,  one(0000610),   one(0170770), "Ddds", m68000up },