aboutsummaryrefslogtreecommitdiff
path: root/opcodes
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2004-05-05 14:33:14 +0000
committerNick Clifton <nickc@redhat.com>2004-05-05 14:33:14 +0000
commit6b6e92f432c86611c81a5da6880946bad25b59dc (patch)
tree9b92050c4b2399f52aebbc64343bdf41fb5642b4 /opcodes
parenta404d431a86c8271c36f168ec7cd4f6678e13209 (diff)
downloadgdb-6b6e92f432c86611c81a5da6880946bad25b59dc.zip
gdb-6b6e92f432c86611c81a5da6880946bad25b59dc.tar.gz
gdb-6b6e92f432c86611c81a5da6880946bad25b59dc.tar.bz2
Add support for 521x,5249,547x,548x.
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog6
-rw-r--r--opcodes/m68k-dis.c34
-rw-r--r--opcodes/m68k-opc.c514
3 files changed, 282 insertions, 272 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index c15b19b..aba0460 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-05 Peter Barada <peter@the-baradas.com>
+
+ * m68k-dis.c(print_insn_m68k): Add new chips, use core
+ variants in arch_mask. Only set m68881/68851 for 68k chips.
+ * m68k-op.c: Switch from ColdFire chips to core variants.
+
2004-05-05 Alan Modra <amodra@bigpond.net.au>
PR 146.
diff --git a/opcodes/m68k-dis.c b/opcodes/m68k-dis.c
index 365d54a..e27a9a6 100644
--- a/opcodes/m68k-dis.c
+++ b/opcodes/m68k-dis.c
@@ -240,48 +240,52 @@ print_insn_m68k (memaddr, info)
arch_mask = (unsigned int) -1;
break;
case bfd_mach_m68000:
- arch_mask = m68000;
+ arch_mask = m68000|m68881|m68851;
break;
case bfd_mach_m68008:
- arch_mask = m68008;
+ arch_mask = m68008|m68881|m68851;
break;
case bfd_mach_m68010:
- arch_mask = m68010;
+ arch_mask = m68010|m68881|m68851;
break;
case bfd_mach_m68020:
- arch_mask = m68020;
+ arch_mask = m68020|m68881|m68851;
break;
case bfd_mach_m68030:
- arch_mask = m68030;
+ arch_mask = m68030|m68881|m68851;
break;
case bfd_mach_m68040:
- arch_mask = m68040;
+ arch_mask = m68040|m68881|m68851;
break;
case bfd_mach_m68060:
- arch_mask = m68060;
+ arch_mask = m68060|m68881|m68851;
break;
case bfd_mach_mcf5200:
- arch_mask = mcf5200;
+ arch_mask = mcfisa_a;
break;
+ case bfd_mach_mcf521x:
case bfd_mach_mcf528x:
- arch_mask = mcf528x | mcfmac;
+ arch_mask = mcfisa_a|mcfhwdiv|mcfisa_aa|mcfusp|mcfemac;
break;
case bfd_mach_mcf5206e:
- arch_mask = mcf5206e | mcfmac;
+ arch_mask = mcfisa_a|mcfhwdiv|mcfmac;
+ break;
+ case bfd_mach_mcf5249:
+ arch_mask = mcfisa_a|mcfhwdiv|mcfemac;
break;
case bfd_mach_mcf5307:
- arch_mask = mcf5307 | mcfmac;
+ arch_mask = mcfisa_a|mcfhwdiv|mcfmac;
break;
case bfd_mach_mcf5407:
- arch_mask = mcf5407 | mcfmac;
+ arch_mask = mcfisa_a|mcfhwdiv|mcfisa_b|mcfmac;
break;
+ case bfd_mach_mcf547x:
+ case bfd_mach_mcf548x:
case bfd_mach_mcfv4e:
- arch_mask = mcfv4e | mcfemac;
+ arch_mask = mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat|mcfemac;
break;
}
- arch_mask |= m68881 | m68851;
-
bestmask = 0;
FETCH_DATA (info, buffer + 2);
major_opcode = (buffer[0] >> 4) & 15;
diff --git a/opcodes/m68k-opc.c b/opcodes/m68k-opc.c
index 805a0fb..9e2e77e 100644
--- a/opcodes/m68k-opc.c
+++ b/opcodes/m68k-opc.c
@@ -36,16 +36,16 @@ const struct m68k_opcode m68k_opcodes[] =
{"abcd", one(0140410), one(0170770), "-s-d", m68000up },
{"addaw", one(0150300), one(0170700), "*wAd", m68000up },
-{"addal", one(0150700), one(0170700), "*lAd", m68000up | mcf },
+{"addal", one(0150700), one(0170700), "*lAd", m68000up | mcfisa_a },
{"addib", one(0003000), one(0177700), "#b$s", m68000up },
{"addiw", one(0003100), one(0177700), "#w$s", m68000up },
{"addil", one(0003200), one(0177700), "#l$s", m68000up },
-{"addil", one(0003200), one(0177700), "#lDs", mcf },
+{"addil", one(0003200), one(0177700), "#lDs", mcfisa_a },
{"addqb", one(0050000), one(0170700), "Qd$b", m68000up },
{"addqw", one(0050100), one(0170700), "Qd%w", m68000up },
-{"addql", one(0050200), one(0170700), "Qd%l", m68000up | mcf },
+{"addql", one(0050200), one(0170700), "Qd%l", m68000up | mcfisa_a },
/* The add opcode can generate the adda, addi, and addq instructions. */
{"addb", one(0050000), one(0170700), "Qd$b", m68000up },
@@ -57,18 +57,18 @@ const struct m68k_opcode m68k_opcodes[] =
{"addw", one(0003100), one(0177700), "#w$s", m68000up },
{"addw", one(0150100), one(0170700), "*wDd", m68000up },
{"addw", one(0150500), one(0170700), "Dd~w", m68000up },
-{"addl", one(0050200), one(0170700), "Qd%l", m68000up | mcf },
+{"addl", one(0050200), one(0170700), "Qd%l", m68000up | mcfisa_a },
{"addl", one(0003200), one(0177700), "#l$s", m68000up },
-{"addl", one(0003200), one(0177700), "#lDs", mcf },
-{"addl", one(0150700), one(0170700), "*lAd", m68000up | mcf },
-{"addl", one(0150200), one(0170700), "*lDd", m68000up | mcf },
-{"addl", one(0150600), one(0170700), "Dd~l", m68000up | mcf },
+{"addl", one(0003200), one(0177700), "#lDs", mcfisa_a },
+{"addl", one(0150700), one(0170700), "*lAd", m68000up | mcfisa_a },
+{"addl", one(0150200), one(0170700), "*lDd", m68000up | mcfisa_a },
+{"addl", one(0150600), one(0170700), "Dd~l", m68000up | mcfisa_a },
{"addxb", one(0150400), one(0170770), "DsDd", m68000up },
{"addxb", one(0150410), one(0170770), "-s-d", m68000up },
{"addxw", one(0150500), one(0170770), "DsDd", m68000up },
{"addxw", one(0150510), one(0170770), "-s-d", m68000up },
-{"addxl", one(0150600), one(0170770), "DsDd", m68000up | mcf },
+{"addxl", one(0150600), one(0170770), "DsDd", m68000up | mcfisa_a },
{"addxl", one(0150610), one(0170770), "-s-d", m68000up },
{"andib", one(0001000), one(0177700), "#b$s", m68000up },
@@ -76,7 +76,7 @@ const struct m68k_opcode m68k_opcodes[] =
{"andiw", one(0001100), one(0177700), "#w$s", m68000up },
{"andiw", one(0001174), one(0177777), "#wSs", m68000up },
{"andil", one(0001200), one(0177700), "#l$s", m68000up },
-{"andil", one(0001200), one(0177700), "#lDs", mcf },
+{"andil", one(0001200), one(0177700), "#lDs", mcfisa_a },
{"andi", one(0001100), one(0177700), "#w$s", m68000up },
{"andi", one(0001074), one(0177777), "#bCs", m68000up },
{"andi", one(0001174), one(0177777), "#wSs", m68000up },
@@ -91,9 +91,9 @@ const struct m68k_opcode m68k_opcodes[] =
{"andw", one(0140100), one(0170700), ";wDd", m68000up },
{"andw", one(0140500), one(0170700), "Dd~w", m68000up },
{"andl", one(0001200), one(0177700), "#l$s", m68000up },
-{"andl", one(0001200), one(0177700), "#lDs", mcf },
-{"andl", one(0140200), one(0170700), ";lDd", m68000up | mcf },
-{"andl", one(0140600), one(0170700), "Dd~l", m68000up | mcf },
+{"andl", one(0001200), one(0177700), "#lDs", mcfisa_a },
+{"andl", one(0140200), one(0170700), ";lDd", m68000up | mcfisa_a },
+{"andl", one(0140600), one(0170700), "Dd~l", m68000up | mcfisa_a },
{"and", one(0001100), one(0177700), "#w$w", m68000up },
{"and", one(0001074), one(0177777), "#bCs", m68000up },
{"and", one(0001174), one(0177777), "#wSs", m68000up },
@@ -105,84 +105,84 @@ const struct m68k_opcode m68k_opcodes[] =
{"aslw", one(0160500), one(0170770), "QdDs", m68000up },
{"aslw", one(0160540), one(0170770), "DdDs", m68000up },
{"aslw", one(0160700), one(0177700), "~s", m68000up },
-{"asll", one(0160600), one(0170770), "QdDs", m68000up | mcf },
-{"asll", one(0160640), one(0170770), "DdDs", m68000up | mcf },
+{"asll", one(0160600), one(0170770), "QdDs", m68000up | mcfisa_a },
+{"asll", one(0160640), one(0170770), "DdDs", m68000up | mcfisa_a },
{"asrb", one(0160000), one(0170770), "QdDs", m68000up },
{"asrb", one(0160040), one(0170770), "DdDs", m68000up },
{"asrw", one(0160100), one(0170770), "QdDs", m68000up },
{"asrw", one(0160140), one(0170770), "DdDs", m68000up },
{"asrw", one(0160300), one(0177700), "~s", m68000up },
-{"asrl", one(0160200), one(0170770), "QdDs", m68000up | mcf },
-{"asrl", one(0160240), one(0170770), "DdDs", m68000up | mcf },
-
-{"bhiw", one(0061000), one(0177777), "BW", m68000up | mcf },
-{"blsw", one(0061400), one(0177777), "BW", m68000up | mcf },
-{"bccw", one(0062000), one(0177777), "BW", m68000up | mcf },
-{"bcsw", one(0062400), one(0177777), "BW", m68000up | mcf },
-{"bnew", one(0063000), one(0177777), "BW", m68000up | mcf },
-{"beqw", one(0063400), one(0177777), "BW", m68000up | mcf },
-{"bvcw", one(0064000), one(0177777), "BW", m68000up | mcf },
-{"bvsw", one(0064400), one(0177777), "BW", m68000up | mcf },
-{"bplw", one(0065000), one(0177777), "BW", m68000up | mcf },
-{"bmiw", one(0065400), one(0177777), "BW", m68000up | mcf },
-{"bgew", one(0066000), one(0177777), "BW", m68000up | mcf },
-{"bltw", one(0066400), one(0177777), "BW", m68000up | mcf },
-{"bgtw", one(0067000), one(0177777), "BW", m68000up | mcf },
-{"blew", one(0067400), one(0177777), "BW", m68000up | mcf },
-
-{"bhil", one(0061377), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"blsl", one(0061777), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bccl", one(0062377), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bcsl", one(0062777), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bnel", one(0063377), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"beql", one(0063777), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bvcl", one(0064377), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bvsl", one(0064777), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bpll", one(0065377), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bmil", one(0065777), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bgel", one(0066377), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bltl", one(0066777), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bgtl", one(0067377), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"blel", one(0067777), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-
-{"bhis", one(0061000), one(0177400), "BB", m68000up | mcf },
-{"blss", one(0061400), one(0177400), "BB", m68000up | mcf },
-{"bccs", one(0062000), one(0177400), "BB", m68000up | mcf },
-{"bcss", one(0062400), one(0177400), "BB", m68000up | mcf },
-{"bnes", one(0063000), one(0177400), "BB", m68000up | mcf },
-{"beqs", one(0063400), one(0177400), "BB", m68000up | mcf },
-{"bvcs", one(0064000), one(0177400), "BB", m68000up | mcf },
-{"bvss", one(0064400), one(0177400), "BB", m68000up | mcf },
-{"bpls", one(0065000), one(0177400), "BB", m68000up | mcf },
-{"bmis", one(0065400), one(0177400), "BB", m68000up | mcf },
-{"bges", one(0066000), one(0177400), "BB", m68000up | mcf },
-{"blts", one(0066400), one(0177400), "BB", m68000up | mcf },
-{"bgts", one(0067000), one(0177400), "BB", m68000up | mcf },
-{"bles", one(0067400), one(0177400), "BB", m68000up | mcf },
-
-{"jhi", one(0061000), one(0177400), "Bg", m68000up | mcf },
-{"jls", one(0061400), one(0177400), "Bg", m68000up | mcf },
-{"jcc", one(0062000), one(0177400), "Bg", m68000up | mcf },
-{"jcs", one(0062400), one(0177400), "Bg", m68000up | mcf },
-{"jne", one(0063000), one(0177400), "Bg", m68000up | mcf },
-{"jeq", one(0063400), one(0177400), "Bg", m68000up | mcf },
-{"jvc", one(0064000), one(0177400), "Bg", m68000up | mcf },
-{"jvs", one(0064400), one(0177400), "Bg", m68000up | mcf },
-{"jpl", one(0065000), one(0177400), "Bg", m68000up | mcf },
-{"jmi", one(0065400), one(0177400), "Bg", m68000up | mcf },
-{"jge", one(0066000), one(0177400), "Bg", m68000up | mcf },
-{"jlt", one(0066400), one(0177400), "Bg", m68000up | mcf },
-{"jgt", one(0067000), one(0177400), "Bg", m68000up | mcf },
-{"jle", one(0067400), one(0177400), "Bg", m68000up | mcf },
-
-{"bchg", one(0000500), one(0170700), "Dd$s", m68000up | mcf },
+{"asrl", one(0160200), one(0170770), "QdDs", m68000up | mcfisa_a },
+{"asrl", one(0160240), one(0170770), "DdDs", m68000up | mcfisa_a },
+
+{"bhiw", one(0061000), one(0177777), "BW", m68000up | mcfisa_a },
+{"blsw", one(0061400), one(0177777), "BW", m68000up | mcfisa_a },
+{"bccw", one(0062000), one(0177777), "BW", m68000up | mcfisa_a },
+{"bcsw", one(0062400), one(0177777), "BW", m68000up | mcfisa_a },
+{"bnew", one(0063000), one(0177777), "BW", m68000up | mcfisa_a },
+{"beqw", one(0063400), one(0177777), "BW", m68000up | mcfisa_a },
+{"bvcw", one(0064000), one(0177777), "BW", m68000up | mcfisa_a },
+{"bvsw", one(0064400), one(0177777), "BW", m68000up | mcfisa_a },
+{"bplw", one(0065000), one(0177777), "BW", m68000up | mcfisa_a },
+{"bmiw", one(0065400), one(0177777), "BW", m68000up | mcfisa_a },
+{"bgew", one(0066000), one(0177777), "BW", m68000up | mcfisa_a },
+{"bltw", one(0066400), one(0177777), "BW", m68000up | mcfisa_a },
+{"bgtw", one(0067000), one(0177777), "BW", m68000up | mcfisa_a },
+{"blew", one(0067400), one(0177777), "BW", m68000up | mcfisa_a },
+
+{"bhil", one(0061377), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"blsl", one(0061777), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bccl", one(0062377), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bcsl", one(0062777), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bnel", one(0063377), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"beql", one(0063777), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bvcl", one(0064377), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bvsl", one(0064777), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bpll", one(0065377), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bmil", one(0065777), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bgel", one(0066377), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bltl", one(0066777), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bgtl", one(0067377), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"blel", one(0067777), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+
+{"bhis", one(0061000), one(0177400), "BB", m68000up | mcfisa_a },
+{"blss", one(0061400), one(0177400), "BB", m68000up | mcfisa_a },
+{"bccs", one(0062000), one(0177400), "BB", m68000up | mcfisa_a },
+{"bcss", one(0062400), one(0177400), "BB", m68000up | mcfisa_a },
+{"bnes", one(0063000), one(0177400), "BB", m68000up | mcfisa_a },
+{"beqs", one(0063400), one(0177400), "BB", m68000up | mcfisa_a },
+{"bvcs", one(0064000), one(0177400), "BB", m68000up | mcfisa_a },
+{"bvss", one(0064400), one(0177400), "BB", m68000up | mcfisa_a },
+{"bpls", one(0065000), one(0177400), "BB", m68000up | mcfisa_a },
+{"bmis", one(0065400), one(0177400), "BB", m68000up | mcfisa_a },
+{"bges", one(0066000), one(0177400), "BB", m68000up | mcfisa_a },
+{"blts", one(0066400), one(0177400), "BB", m68000up | mcfisa_a },
+{"bgts", one(0067000), one(0177400), "BB", m68000up | mcfisa_a },
+{"bles", one(0067400), one(0177400), "BB", m68000up | mcfisa_a },
+
+{"jhi", one(0061000), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jls", one(0061400), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jcc", one(0062000), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jcs", one(0062400), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jne", one(0063000), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jeq", one(0063400), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jvc", one(0064000), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jvs", one(0064400), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jpl", one(0065000), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jmi", one(0065400), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jge", one(0066000), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jlt", one(0066400), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jgt", one(0067000), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jle", one(0067400), one(0177400), "Bg", m68000up | mcfisa_a },
+
+{"bchg", one(0000500), one(0170700), "Dd$s", m68000up | mcfisa_a },
{"bchg", one(0004100), one(0177700), "#b$s", m68000up },
-{"bchg", one(0004100), one(0177700), "#bqs", mcf },
+{"bchg", one(0004100), one(0177700), "#bqs", mcfisa_a },
-{"bclr", one(0000600), one(0170700), "Dd$s", m68000up | mcf },
+{"bclr", one(0000600), one(0170700), "Dd$s", m68000up | mcfisa_a },
{"bclr", one(0004200), one(0177700), "#b$s", m68000up },
-{"bclr", one(0004200), one(0177700), "#bqs", mcf },
+{"bclr", one(0004200), one(0177700), "#bqs", mcfisa_a },
{"bfchg", two(0165300, 0), two(0177700, 0170000), "?sO2O3", m68020up },
{"bfclr", two(0166300, 0), two(0177700, 0170000), "?sO2O3", m68020up },
@@ -195,28 +195,28 @@ const struct m68k_opcode m68k_opcodes[] =
{"bgnd", one(0045372), one(0177777), "", cpu32 },
-{"bitrev", one(0000300), one(0177770), "Ds", mcf528x},
+{"bitrev", one(0000300), one(0177770), "Ds", mcfisa_aa},
{"bkpt", one(0044110), one(0177770), "ts", m68010up },
-{"braw", one(0060000), one(0177777), "BW", m68000up | mcf },
-{"bral", one(0060377), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bras", one(0060000), one(0177400), "BB", m68000up | mcf },
+{"braw", one(0060000), one(0177777), "BW", m68000up | mcfisa_a },
+{"bral", one(0060377), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bras", one(0060000), one(0177400), "BB", m68000up | mcfisa_a },
-{"bset", one(0000700), one(0170700), "Dd$s", m68000up | mcf },
-{"bset", one(0000700), one(0170700), "Ddvs", mcf },
+{"bset", one(0000700), one(0170700), "Dd$s", m68000up | mcfisa_a },
+{"bset", one(0000700), one(0170700), "Ddvs", mcfisa_a },
{"bset", one(0004300), one(0177700), "#b$s", m68000up },
-{"bset", one(0004300), one(0177700), "#bqs", mcf },
+{"bset", one(0004300), one(0177700), "#bqs", mcfisa_a },
-{"bsrw", one(0060400), one(0177777), "BW", m68000up | mcf },
-{"bsrl", one(0060777), one(0177777), "BL", m68020up | cpu32 | mcfv4up},
-{"bsrs", one(0060400), one(0177400), "BB", m68000up | mcf },
+{"bsrw", one(0060400), one(0177777), "BW", m68000up | mcfisa_a },
+{"bsrl", one(0060777), one(0177777), "BL", m68020up | cpu32 | mcfisa_b},
+{"bsrs", one(0060400), one(0177400), "BB", m68000up | mcfisa_a },
-{"btst", one(0000400), one(0170700), "Dd;b", m68000up | mcf },
+{"btst", one(0000400), one(0170700), "Dd;b", m68000up | mcfisa_a },
{"btst", one(0004000), one(0177700), "#b@s", m68000up },
-{"btst", one(0004000), one(0177700), "#bqs", mcf },
+{"btst", one(0004000), one(0177700), "#bqs", mcfisa_a },
-{"byterev", one(0001300), one(0177770), "Ds", mcf528x},
+{"byterev", one(0001300), one(0177770), "Ds", mcfisa_aa},
{"callm", one(0003300), one(0177700), "#b!s", m68020 },
@@ -245,30 +245,30 @@ const struct m68k_opcode m68k_opcodes[] =
{"cinvp", one(0xf400|SCOPE_PAGE), one(0xff38), "ceas", m68040up },
{"cpusha", one(0xf420|SCOPE_ALL), one(0xff38), "ce", m68040up },
-{"cpushl", one(0xf420|SCOPE_LINE), one(0xff38), "ceas", m68040up | mcf },
+{"cpushl", one(0xf420|SCOPE_LINE), one(0xff38), "ceas", m68040up | mcfisa_a },
{"cpushp", one(0xf420|SCOPE_PAGE), one(0xff38), "ceas", m68040up },
#undef SCOPE_LINE
#undef SCOPE_PAGE
#undef SCOPE_ALL
-{"clrb", one(0041000), one(0177700), "$s", m68000up | mcf },
-{"clrw", one(0041100), one(0177700), "$s", m68000up | mcf },
-{"clrl", one(0041200), one(0177700), "$s", m68000up | mcf },
+{"clrb", one(0041000), one(0177700), "$s", m68000up | mcfisa_a },
+{"clrw", one(0041100), one(0177700), "$s", m68000up | mcfisa_a },
+{"clrl", one(0041200), one(0177700), "$s", m68000up | mcfisa_a },
{"cmp2b", two(0000300,0), two(0177700,07777), "!sR1", m68020up | cpu32 },
{"cmp2w", two(0001300,0), two(0177700,07777), "!sR1", m68020up | cpu32 },
{"cmp2l", two(0002300,0), two(0177700,07777), "!sR1", m68020up | cpu32 },
{"cmpaw", one(0130300), one(0170700), "*wAd", m68000up },
-{"cmpal", one(0130700), one(0170700), "*lAd", m68000up | mcf },
+{"cmpal", one(0130700), one(0170700), "*lAd", m68000up | mcfisa_a },
{"cmpib", one(0006000), one(0177700), "#b@s", m68000up },
-{"cmpib", one(0006000), one(0177700), "#bDs", mcfv4up },
+{"cmpib", one(0006000), one(0177700), "#bDs", mcfisa_b },
{"cmpiw", one(0006100), one(0177700), "#w@s", m68000up },
-{"cmpiw", one(0006100), one(0177700), "#wDs", mcfv4up },
+{"cmpiw", one(0006100), one(0177700), "#wDs", mcfisa_b },
{"cmpil", one(0006200), one(0177700), "#l@s", m68000up },
-{"cmpil", one(0006200), one(0177700), "#lDs", mcf },
+{"cmpil", one(0006200), one(0177700), "#lDs", mcfisa_a },
{"cmpmb", one(0130410), one(0170770), "+s+d", m68000up },
{"cmpmw", one(0130510), one(0170770), "+s+d", m68000up },
@@ -276,20 +276,20 @@ const struct m68k_opcode m68k_opcodes[] =
/* The cmp opcode can generate the cmpa, cmpm, and cmpi instructions. */
{"cmpb", one(0006000), one(0177700), "#b@s", m68000up },
-{"cmpb", one(0006000), one(0177700), "#bDs", mcfv4up },
+{"cmpb", one(0006000), one(0177700), "#bDs", mcfisa_b },
{"cmpb", one(0130410), one(0170770), "+s+d", m68000up },
{"cmpb", one(0130000), one(0170700), ";bDd", m68000up },
-{"cmpb", one(0130000), one(0170700), "*bDd", mcfv4up },
+{"cmpb", one(0130000), one(0170700), "*bDd", mcfisa_b },
{"cmpw", one(0130300), one(0170700), "*wAd", m68000up },
{"cmpw", one(0006100), one(0177700), "#w@s", m68000up },
-{"cmpw", one(0006100), one(0177700), "#wDs", mcfv4up },
+{"cmpw", one(0006100), one(0177700), "#wDs", mcfisa_b },
{"cmpw", one(0130510), one(0170770), "+s+d", m68000up },
-{"cmpw", one(0130100), one(0170700), "*wDd", m68000up | mcfv4up },
-{"cmpl", one(0130700), one(0170700), "*lAd", m68000up | mcf },
+{"cmpw", one(0130100), one(0170700), "*wDd", m68000up | mcfisa_b },
+{"cmpl", one(0130700), one(0170700), "*lAd", m68000up | mcfisa_a },
{"cmpl", one(0006200), one(0177700), "#l@s", m68000up },
-{"cmpl", one(0006200), one(0177700), "#lDs", mcf },
+{"cmpl", one(0006200), one(0177700), "#lDs", mcfisa_a },
{"cmpl", one(0130610), one(0170770), "+s+d", m68000up },
-{"cmpl", one(0130200), one(0170700), "*lDd", m68000up | mcf },
+{"cmpl", one(0130200), one(0170700), "*lDd", m68000up | mcfisa_a },
{"dbcc", one(0052310), one(0177770), "DsBw", m68000up },
{"dbcs", one(0052710), one(0177770), "DsBw", m68000up },
@@ -308,20 +308,20 @@ const struct m68k_opcode m68k_opcodes[] =
{"dbvc", one(0054310), one(0177770), "DsBw", m68000up },
{"dbvs", one(0054710), one(0177770), "DsBw", m68000up },
-{"divsw", one(0100700), one(0170700), ";wDd", m68000up | mcf5206eup },
+{"divsw", one(0100700), one(0170700), ";wDd", m68000up | mcfhwdiv },
{"divsl", two(0046100,0006000),two(0177700,0107770),";lD3D1", m68020up|cpu32 },
{"divsl", two(0046100,0004000),two(0177700,0107770),";lDD", m68020up|cpu32 },
-{"divsl", two(0046100,0004000),two(0177700,0107770),"qsDD", mcf5206eup },
+{"divsl", two(0046100,0004000),two(0177700,0107770),"qsDD", mcfhwdiv },
{"divsll", two(0046100,0004000),two(0177700,0107770),";lD3D1",m68020up|cpu32 },
{"divsll", two(0046100,0004000),two(0177700,0107770),";lDD", m68020up|cpu32 },
-{"divuw", one(0100300), one(0170700), ";wDd", m68000up | mcf5206eup },
+{"divuw", one(0100300), one(0170700), ";wDd", m68000up | mcfhwdiv },
{"divul", two(0046100,0002000),two(0177700,0107770),";lD3D1", m68020up|cpu32 },
{"divul", two(0046100,0000000),two(0177700,0107770),";lDD", m68020up|cpu32 },
-{"divul", two(0046100,0000000),two(0177700,0107770),"qsDD", mcf5206eup },
+{"divul", two(0046100,0000000),two(0177700,0107770),"qsDD", mcfhwdiv },
{"divull", two(0046100,0000000),two(0177700,0107770),";lD3D1",m68020up|cpu32 },
{"divull", two(0046100,0000000),two(0177700,0107770),";lDD", m68020up|cpu32 },
@@ -331,7 +331,7 @@ const struct m68k_opcode m68k_opcodes[] =
{"eoriw", one(0005100), one(0177700), "#w$s", m68000up },
{"eoriw", one(0005174), one(0177777), "#wSs", m68000up },
{"eoril", one(0005200), one(0177700), "#l$s", m68000up },
-{"eoril", one(0005200), one(0177700), "#lDs", mcf },
+{"eoril", one(0005200), one(0177700), "#lDs", mcfisa_a },
{"eori", one(0005074), one(0177777), "#bCs", m68000up },
{"eori", one(0005174), one(0177777), "#wSs", m68000up },
{"eori", one(0005100), one(0177700), "#w$s", m68000up },
@@ -344,8 +344,8 @@ const struct m68k_opcode m68k_opcodes[] =
{"eorw", one(0005174), one(0177777), "#wSs", m68000up },
{"eorw", one(0130500), one(0170700), "Dd$s", m68000up },
{"eorl", one(0005200), one(0177700), "#l$s", m68000up },
-{"eorl", one(0005200), one(0177700), "#lDs", mcf },
-{"eorl", one(0130600), one(0170700), "Dd$s", m68000up | mcf },
+{"eorl", one(0005200), one(0177700), "#lDs", mcfisa_a },
+{"eorl", one(0130600), one(0170700), "Dd$s", m68000up | mcfisa_a },
{"eor", one(0005074), one(0177777), "#bCs", m68000up },
{"eor", one(0005174), one(0177777), "#wSs", m68000up },
{"eor", one(0005100), one(0177700), "#w$s", m68000up },
@@ -356,11 +356,11 @@ const struct m68k_opcode m68k_opcodes[] =
{"exg", one(0140610), one(0170770), "DdAs", m68000up },
{"exg", one(0140610), one(0170770), "AsDd", m68000up },
-{"extw", one(0044200), one(0177770), "Ds", m68000up|mcf },
-{"extl", one(0044300), one(0177770), "Ds", m68000up|mcf },
-{"extbl", one(0044700), one(0177770), "Ds", m68020up|cpu32|mcf },
+{"extw", one(0044200), one(0177770), "Ds", m68000up|mcfisa_a },
+{"extl", one(0044300), one(0177770), "Ds", m68000up|mcfisa_a },
+{"extbl", one(0044700), one(0177770), "Ds", m68020up|cpu32|mcfisa_a },
-{"ff1", one(0002300), one(0177770), "Ds", mcf528x},
+{"ff1", one(0002300), one(0177770), "Ds", mcfisa_aa},
/* float stuff starts here */
@@ -1419,28 +1419,28 @@ const struct m68k_opcode m68k_opcodes[] =
{"ftwotoxx", two(0xF000, 0x4811), two(0xF1C0, 0xFC7F), "Ii;xF7", mfloat },
{"ftwotoxx", two(0xF000, 0x0011), two(0xF1C0, 0xE07F), "IiFt", mfloat },
-{"halt", one(0045310), one(0177777), "", m68060 | mcf },
+{"halt", one(0045310), one(0177777), "", m68060 | mcfisa_a },
-{"illegal", one(0045374), one(0177777), "", m68000up | mcf },
-{"intouch", one(0xf428), one(0xfff8), "As", mcfv4eup },
+{"illegal", one(0045374), one(0177777), "", m68000up | mcfisa_a },
+{"intouch", one(0xf428), one(0xfff8), "As", mcfisa_b },
-{"jmp", one(0047300), one(0177700), "!s", m68000up | mcf },
+{"jmp", one(0047300), one(0177700), "!s", m68000up | mcfisa_a },
-{"jra", one(0060000), one(0177400), "Bg", m68000up | mcf },
-{"jra", one(0047300), one(0177700), "!s", m68000up | mcf },
+{"jra", one(0060000), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jra", one(0047300), one(0177700), "!s", m68000up | mcfisa_a },
-{"jsr", one(0047200), one(0177700), "!s", m68000up | mcf },
+{"jsr", one(0047200), one(0177700), "!s", m68000up | mcfisa_a },
-{"jbsr", one(0060400), one(0177400), "Bg", m68000up | mcf },
-{"jbsr", one(0047200), one(0177700), "!s", m68000up | mcf },
+{"jbsr", one(0060400), one(0177400), "Bg", m68000up | mcfisa_a },
+{"jbsr", one(0047200), one(0177700), "!s", m68000up | mcfisa_a },
-{"lea", one(0040700), one(0170700), "!sAd", m68000up | mcf },
+{"lea", one(0040700), one(0170700), "!sAd", m68000up | mcfisa_a },
{"lpstop", two(0174000,0000700),two(0177777,0177777),"#w", cpu32|m68060 },
-{"linkw", one(0047120), one(0177770), "As#w", m68000up | mcf },
+{"linkw", one(0047120), one(0177770), "As#w", m68000up | mcfisa_a },
{"linkl", one(0044010), one(0177770), "As#l", m68020up | cpu32 },
-{"link", one(0047120), one(0177770), "As#W", m68000up | mcf },
+{"link", one(0047120), one(0177770), "As#W", m68000up | mcfisa_a },
{"link", one(0044010), one(0177770), "As#l", m68020up | cpu32 },
{"lslb", one(0160410), one(0170770), "QdDs", m68000up },
@@ -1448,16 +1448,16 @@ const struct m68k_opcode m68k_opcodes[] =
{"lslw", one(0160510), one(0170770), "QdDs", m68000up },
{"lslw", one(0160550), one(0170770), "DdDs", m68000up },
{"lslw", one(0161700), one(0177700), "~s", m68000up },
-{"lsll", one(0160610), one(0170770), "QdDs", m68000up | mcf },
-{"lsll", one(0160650), one(0170770), "DdDs", m68000up | mcf },
+{"lsll", one(0160610), one(0170770), "QdDs", m68000up | mcfisa_a },
+{"lsll", one(0160650), one(0170770), "DdDs", m68000up | mcfisa_a },
{"lsrb", one(0160010), one(0170770), "QdDs", m68000up },
{"lsrb", one(0160050), one(0170770), "DdDs", m68000up },
{"lsrw", one(0160110), one(0170770), "QdDs", m68000up },
{"lsrw", one(0160150), one(0170770), "DdDs", m68000up },
{"lsrw", one(0161300), one(0177700), "~s", m68000up },
-{"lsrl", one(0160210), one(0170770), "QdDs", m68000up | mcf },
-{"lsrl", one(0160250), one(0170770), "DdDs", m68000up | mcf },
+{"lsrl", one(0160210), one(0170770), "QdDs", m68000up | mcfisa_a },
+{"lsrl", one(0160250), one(0170770), "DdDs", m68000up | mcfisa_a },
{"macw", two(0xa000, 0x0000), two(0xf1b0, 0x0800), "uMum", mcfmac },
{"macw", two(0xa000, 0x0000), two(0xf1b0, 0x0b00), "uMumiI", mcfmac },
@@ -1504,13 +1504,13 @@ const struct m68k_opcode m68k_opcodes[] =
jtc@cygnus.com - 97/01/24
*/
-{"moveal", one(0020100), one(0170700), "*lAd", m68000up | mcf },
-{"moveaw", one(0030100), one(0170700), "*wAd", m68000up | mcf },
+{"moveal", one(0020100), one(0170700), "*lAd", m68000up | mcfisa_a },
+{"moveaw", one(0030100), one(0170700), "*wAd", m68000up | mcfisa_a },
{"movclrl", one(0xA1C0), one(0xf9f0), "eFRs", mcfemac },
-{"movec", one(0047173), one(0177777), "R1Jj", m68010up | mcf },
-{"movec", one(0047173), one(0177777), "R1#j", m68010up | mcf },
+{"movec", one(0047173), one(0177777), "R1Jj", m68010up | mcfisa_a },
+{"movec", one(0047173), one(0177777), "R1#j", m68010up | mcfisa_a },
{"movec", one(0047172), one(0177777), "JjR1", m68010up },
{"movec", one(0047172), one(0177777), "#jR1", m68010up },
@@ -1525,60 +1525,60 @@ const struct m68k_opcode m68k_opcodes[] =
{"moveml", one(0046300), one(0177700), "<sLw", m68000up },
{"moveml", one(0046300), one(0177700), "<s#w", m68000up },
/* FIXME: need specifier for mode 2 and 5 to simplify below insn patterns */
-{"moveml", one(0044320), one(0177770), "Lwas", mcf },
-{"moveml", one(0044320), one(0177770), "#was", mcf },
-{"moveml", one(0044350), one(0177770), "Lwds", mcf },
-{"moveml", one(0044350), one(0177770), "#wds", mcf },
-{"moveml", one(0046320), one(0177770), "asLw", mcf },
-{"moveml", one(0046320), one(0177770), "as#w", mcf },
-{"moveml", one(0046350), one(0177770), "dsLw", mcf },
-{"moveml", one(0046350), one(0177770), "ds#w", mcf },
+{"moveml", one(0044320), one(0177770), "Lwas", mcfisa_a },
+{"moveml", one(0044320), one(0177770), "#was", mcfisa_a },
+{"moveml", one(0044350), one(0177770), "Lwds", mcfisa_a },
+{"moveml", one(0044350), one(0177770), "#wds", mcfisa_a },
+{"moveml", one(0046320), one(0177770), "asLw", mcfisa_a },
+{"moveml", one(0046320), one(0177770), "as#w", mcfisa_a },
+{"moveml", one(0046350), one(0177770), "dsLw", mcfisa_a },
+{"moveml", one(0046350), one(0177770), "ds#w", mcfisa_a },
{"movepw", one(0000410), one(0170770), "dsDd", m68000up },
{"movepw", one(0000610), one(0170770), "Ddds", m68000up },
{"movepl", one(0000510), one(0170770), "dsDd", m68000up },
{"movepl", one(0000710), one(0170770), "Ddds", m68000up },
-{"moveq", one(0070000), one(0170400), "MsDd", m68000up | mcf },
-{"moveq", one(0070000), one(0170400), "#BDd", m68000up | mcf },
+{"moveq", one(0070000), one(0170400), "MsDd", m68000up | mcfisa_a },
+{"moveq", one(0070000), one(0170400), "#BDd", m68000up | mcfisa_a },
/* The move opcode can generate the movea and moveq instructions. */
{"moveb", one(0010000), one(0170000), ";b$d", m68000up },
-{"moveb", one(0010000), one(0170070), "Ds$d", mcf },
-{"moveb", one(0010020), one(0170070), "as$d", mcf },
-{"moveb", one(0010030), one(0170070), "+s$d", mcf },
-{"moveb", one(0010040), one(0170070), "-s$d", mcf },
-{"moveb", one(0010000), one(0170000), "nsqd", mcf },
-{"moveb", one(0010000), one(0170700), "obDd", mcf },
-{"moveb", one(0010200), one(0170700), "obad", mcf },
-{"moveb", one(0010300), one(0170700), "ob+d", mcf },
-{"moveb", one(0010400), one(0170700), "ob-d", mcf },
-{"moveb", one(0010000), one(0170000), "obnd", mcfv4up },
+{"moveb", one(0010000), one(0170070), "Ds$d", mcfisa_a },
+{"moveb", one(0010020), one(0170070), "as$d", mcfisa_a },
+{"moveb", one(0010030), one(0170070), "+s$d", mcfisa_a },
+{"moveb", one(0010040), one(0170070), "-s$d", mcfisa_a },
+{"moveb", one(0010000), one(0170000), "nsqd", mcfisa_a },
+{"moveb", one(0010000), one(0170700), "obDd", mcfisa_a },
+{"moveb", one(0010200), one(0170700), "obad", mcfisa_a },
+{"moveb", one(0010300), one(0170700), "ob+d", mcfisa_a },
+{"moveb", one(0010400), one(0170700), "ob-d", mcfisa_a },
+{"moveb", one(0010000), one(0170000), "obnd", mcfisa_b },
{"movew", one(0030000), one(0170000), "*w%d", m68000up },
-{"movew", one(0030000), one(0170000), "ms%d", mcf },
-{"movew", one(0030000), one(0170000), "nspd", mcf },
-{"movew", one(0030000), one(0170000), "owmd", mcf },
-{"movew", one(0030000), one(0170000), "ownd", mcfv4up },
+{"movew", one(0030000), one(0170000), "ms%d", mcfisa_a },
+{"movew", one(0030000), one(0170000), "nspd", mcfisa_a },
+{"movew", one(0030000), one(0170000), "owmd", mcfisa_a },
+{"movew", one(0030000), one(0170000), "ownd", mcfisa_b },
{"movew", one(0040300), one(0177700), "Ss$s", m68000up },
-{"movew", one(0040300), one(0177770), "SsDs", mcf },
+{"movew", one(0040300), one(0177770), "SsDs", mcfisa_a },
{"movew", one(0041300), one(0177700), "Cs$s", m68010up },
-{"movew", one(0041300), one(0177770), "CsDs", mcf },
+{"movew", one(0041300), one(0177770), "CsDs", mcfisa_a },
{"movew", one(0042300), one(0177700), ";wCd", m68000up },
-{"movew", one(0042300), one(0177700), "DsCd", mcf },
-{"movew", one(0042374), one(0177777), "#wCd", mcf },
+{"movew", one(0042300), one(0177700), "DsCd", mcfisa_a },
+{"movew", one(0042374), one(0177777), "#wCd", mcfisa_a },
{"movew", one(0043300), one(0177700), ";wSd", m68000up },
-{"movew", one(0043300), one(0177700), "DsSd", mcf },
-{"movew", one(0043374), one(0177777), "#wSd", mcf },
+{"movew", one(0043300), one(0177700), "DsSd", mcfisa_a },
+{"movew", one(0043374), one(0177777), "#wSd", mcfisa_a },
-{"movel", one(0070000), one(0170400), "MsDd", m68000up | mcf },
+{"movel", one(0070000), one(0170400), "MsDd", m68000up | mcfisa_a },
{"movel", one(0020000), one(0170000), "*l%d", m68000up },
-{"movel", one(0020000), one(0170000), "ms%d", mcf },
-{"movel", one(0020000), one(0170000), "nspd", mcf },
-{"movel", one(0020000), one(0170000), "olmd", mcf },
-{"movel", one(0020000), one(0170000), "olnd", mcfv4up },
-{"movel", one(0047140), one(0177770), "AsUd", m68000up | mcfv4e },
-{"movel", one(0047150), one(0177770), "UdAs", m68000up | mcfv4e },
+{"movel", one(0020000), one(0170000), "ms%d", mcfisa_a },
+{"movel", one(0020000), one(0170000), "nspd", mcfisa_a },
+{"movel", one(0020000), one(0170000), "olmd", mcfisa_a },
+{"movel", one(0020000), one(0170000), "olnd", mcfisa_b },
+{"movel", one(0047140), one(0177770), "AsUd", m68000up | mcfusp },
+{"movel", one(0047150), one(0177770), "UdAs", m68000up | mcfusp },
{"movel", one(0120600), one(0177760), "EsRs", mcfmac },
{"movel", one(0120400), one(0177760), "RsEs", mcfmac },
{"movel", one(0120474), one(0177777), "#lEs", mcfmac },
@@ -1606,29 +1606,29 @@ const struct m68k_opcode m68k_opcodes[] =
{"movel", one(0xad3c), one(0xffff), "#lH-", mcfemac }, /* #,mask. */
{"move", one(0030000), one(0170000), "*w%d", m68000up },
-{"move", one(0030000), one(0170000), "ms%d", mcf },
-{"move", one(0030000), one(0170000), "nspd", mcf },
-{"move", one(0030000), one(0170000), "owmd", mcf },
-{"move", one(0030000), one(0170000), "ownd", mcfv4up },
+{"move", one(0030000), one(0170000), "ms%d", mcfisa_a },
+{"move", one(0030000), one(0170000), "nspd", mcfisa_a },
+{"move", one(0030000), one(0170000), "owmd", mcfisa_a },
+{"move", one(0030000), one(0170000), "ownd", mcfisa_b },
{"move", one(0040300), one(0177700), "Ss$s", m68000up },
-{"move", one(0040300), one(0177770), "SsDs", mcf },
+{"move", one(0040300), one(0177770), "SsDs", mcfisa_a },
{"move", one(0041300), one(0177700), "Cs$s", m68010up },
-{"move", one(0041300), one(0177770), "CsDs", mcf },
+{"move", one(0041300), one(0177770), "CsDs", mcfisa_a },
{"move", one(0042300), one(0177700), ";wCd", m68000up },
-{"move", one(0042300), one(0177700), "DsCd", mcf },
-{"move", one(0042374), one(0177777), "#wCd", mcf },
+{"move", one(0042300), one(0177700), "DsCd", mcfisa_a },
+{"move", one(0042374), one(0177777), "#wCd", mcfisa_a },
{"move", one(0043300), one(0177700), ";wSd", m68000up },
-{"move", one(0043300), one(0177700), "DsSd", mcf },
-{"move", one(0043374), one(0177777), "#wSd", mcf },
+{"move", one(0043300), one(0177700), "DsSd", mcfisa_a },
+{"move", one(0043374), one(0177777), "#wSd", mcfisa_a },
{"move", one(0047140), one(0177770), "AsUd", m68000up },
{"move", one(0047150), one(0177770), "UdAs", m68000up },
-{"mov3ql", one(0120500), one(0170700), "xd%s", mcfv4up },
-{"mvsb", one(0070400), one(0170700), "*bDd", mcfv4up },
-{"mvsw", one(0070500), one(0170700), "*wDd", mcfv4up },
-{"mvzb", one(0070600), one(0170700), "*bDd", mcfv4up },
-{"mvzw", one(0070700), one(0170700), "*wDd", mcfv4up },
+{"mov3ql", one(0120500), one(0170700), "xd%s", mcfisa_b },
+{"mvsb", one(0070400), one(0170700), "*bDd", mcfisa_b },
+{"mvsw", one(0070500), one(0170700), "*wDd", mcfisa_b },
+{"mvzb", one(0070600), one(0170700), "*bDd", mcfisa_b },
+{"mvzw", one(0070700), one(0170700), "*wDd", mcfisa_b },
{"movesb", two(0007000, 0), two(0177700, 07777), "~sR1", m68010up },
{"movesb", two(0007000, 04000), two(0177700, 07777), "R1~s", m68010up },
@@ -1671,14 +1671,14 @@ const struct m68k_opcode m68k_opcodes[] =
{"msacl", two(0xa000, 0x0900), two(0xf100, 0x0900), "R3R1iI4/RneG", mcfemac },
{"msacl", two(0xa000, 0x0b00), two(0xf100, 0x0900), "R3R1Mh4/RneG", mcfemac },
-{"mulsw", one(0140700), one(0170700), ";wDd", m68000up|mcf },
+{"mulsw", one(0140700), one(0170700), ";wDd", m68000up|mcfisa_a },
{"mulsl", two(0046000,004000), two(0177700,0107770), ";lD1", m68020up|cpu32 },
-{"mulsl", two(0046000,004000), two(0177700,0107770), "qsD1", mcf },
+{"mulsl", two(0046000,004000), two(0177700,0107770), "qsD1", mcfisa_a },
{"mulsl", two(0046000,006000), two(0177700,0107770), ";lD3D1",m68020up|cpu32 },
-{"muluw", one(0140300), one(0170700), ";wDd", m68000up|mcf },
+{"muluw", one(0140300), one(0170700), ";wDd", m68000up|mcfisa_a },
{"mulul", two(0046000,000000), two(0177700,0107770), ";lD1", m68020up|cpu32 },
-{"mulul", two(0046000,000000), two(0177700,0107770), "qsD1", mcf },
+{"mulul", two(0046000,000000), two(0177700,0107770), "qsD1", mcfisa_a },
{"mulul", two(0046000,002000), two(0177700,0107770), ";lD3D1",m68020up|cpu32 },
{"nbcd", one(0044000), one(0177700), "$s", m68000up },
@@ -1686,26 +1686,26 @@ const struct m68k_opcode m68k_opcodes[] =
{"negb", one(0042000), one(0177700), "$s", m68000up },
{"negw", one(0042100), one(0177700), "$s", m68000up },
{"negl", one(0042200), one(0177700), "$s", m68000up },
-{"negl", one(0042200), one(0177700), "Ds", mcf},
+{"negl", one(0042200), one(0177700), "Ds", mcfisa_a},
{"negxb", one(0040000), one(0177700), "$s", m68000up },
{"negxw", one(0040100), one(0177700), "$s", m68000up },
{"negxl", one(0040200), one(0177700), "$s", m68000up },
-{"negxl", one(0040200), one(0177700), "Ds", mcf},
+{"negxl", one(0040200), one(0177700), "Ds", mcfisa_a},
-{"nop", one(0047161), one(0177777), "", m68000up | mcf},
+{"nop", one(0047161), one(0177777), "", m68000up | mcfisa_a},
{"notb", one(0043000), one(0177700), "$s", m68000up },
{"notw", one(0043100), one(0177700), "$s", m68000up },
{"notl", one(0043200), one(0177700), "$s", m68000up },
-{"notl", one(0043200), one(0177700), "Ds", mcf},
+{"notl", one(0043200), one(0177700), "Ds", mcfisa_a},
{"orib", one(0000000), one(0177700), "#b$s", m68000up },
{"orib", one(0000074), one(0177777), "#bCs", m68000up },
{"oriw", one(0000100), one(0177700), "#w$s", m68000up },
{"oriw", one(0000174), one(0177777), "#wSs", m68000up },
{"oril", one(0000200), one(0177700), "#l$s", m68000up },
-{"oril", one(0000200), one(0177700), "#lDs", mcf },
+{"oril", one(0000200), one(0177700), "#lDs", mcfisa_a },
{"ori", one(0000074), one(0177777), "#bCs", m68000up },
{"ori", one(0000100), one(0177700), "#w$s", m68000up },
{"ori", one(0000174), one(0177777), "#wSs", m68000up },
@@ -1720,9 +1720,9 @@ const struct m68k_opcode m68k_opcodes[] =
{"orw", one(0100100), one(0170700), ";wDd", m68000up },
{"orw", one(0100500), one(0170700), "Dd~s", m68000up },
{"orl", one(0000200), one(0177700), "#l$s", m68000up },
-{"orl", one(0000200), one(0177700), "#lDs", mcf },
-{"orl", one(0100200), one(0170700), ";lDd", m68000up | mcf },
-{"orl", one(0100600), one(0170700), "Dd~s", m68000up | mcf },
+{"orl", one(0000200), one(0177700), "#lDs", mcfisa_a },
+{"orl", one(0100200), one(0170700), ";lDd", m68000up | mcfisa_a },
+{"orl", one(0100600), one(0170700), "Dd~s", m68000up | mcfisa_a },
{"or", one(0000074), one(0177777), "#bCs", m68000up },
{"or", one(0000100), one(0177700), "#w$s", m68000up },
{"or", one(0000174), one(0177777), "#wSs", m68000up },
@@ -1782,7 +1782,7 @@ const struct m68k_opcode m68k_opcodes[] =
{"pdbwc", two(0xf048, 0x0009), two(0xfff8, 0xffff), "DsBw", m68851 },
{"pdbws", two(0xf048, 0x0008), two(0xfff8, 0xffff), "DsBw", m68851 },
-{"pea", one(0044100), one(0177700), "!s", m68000up|mcf },
+{"pea", one(0044100), one(0177700), "!s", m68000up|mcfisa_a },
{"pflusha", one(0xf518), one(0xfff8), "", m68040up },
{"pflusha", two(0xf000,0x2400), two(0xffff,0xffff), "", m68030 | m68851 },
@@ -1940,14 +1940,14 @@ const struct m68k_opcode m68k_opcodes[] =
{"ptrapwsl", two(0xf07b, 0x0008), two(0xffff, 0xffff), "#l", m68851 },
{"ptrapws", two(0xf07c, 0x0008), two(0xffff, 0xffff), "", m68851 },
-{"pulse", one(0045314), one(0177777), "", m68060 | mcf },
+{"pulse", one(0045314), one(0177777), "", m68060 | mcfisa_a },
{"pvalid", two(0xf000, 0x2800), two(0xffc0, 0xffff), "Vs&s", m68851 },
{"pvalid", two(0xf000, 0x2c00), two(0xffc0, 0xfff8), "A3&s", m68851 },
/* FIXME: don't allow Dw==Dx. */
-{"remsl", two(0x4c40, 0x0800), two(0xffc0, 0x8ff8), "qsD3D1", mcf5206eup },
-{"remul", two(0x4c40, 0x0000), two(0xffc0, 0x8ff8), "qsD3D1", mcf5206eup },
+{"remsl", two(0x4c40, 0x0800), two(0xffc0, 0x8ff8), "qsD3D1", mcfhwdiv },
+{"remul", two(0x4c40, 0x0000), two(0xffc0, 0x8ff8), "qsD3D1", mcfhwdiv },
{"reset", one(0047160), one(0177777), "", m68000up },
@@ -1985,67 +1985,67 @@ const struct m68k_opcode m68k_opcodes[] =
{"rtd", one(0047164), one(0177777), "#w", m68010up },
-{"rte", one(0047163), one(0177777), "", m68000up | mcf },
+{"rte", one(0047163), one(0177777), "", m68000up | mcfisa_a },
{"rtm", one(0003300), one(0177760), "Rs", m68020 },
{"rtr", one(0047167), one(0177777), "", m68000up },
-{"rts", one(0047165), one(0177777), "", m68000up | mcf },
+{"rts", one(0047165), one(0177777), "", m68000up | mcfisa_a },
-{"satsl", one(0046200), one(0177770), "Ds", mcfv4up },
+{"satsl", one(0046200), one(0177770), "Ds", mcfisa_b },
{"sbcd", one(0100400), one(0170770), "DsDd", m68000up },
{"sbcd", one(0100410), one(0170770), "-s-d", m68000up },
{"scc", one(0052300), one(0177700), "$s", m68000up },
-{"scc", one(0052300), one(0177700), "Ds", mcf },
+{"scc", one(0052300), one(0177700), "Ds", mcfisa_a },
{"scs", one(0052700), one(0177700), "$s", m68000up },
-{"scs", one(0052700), one(0177700), "Ds", mcf },
+{"scs", one(0052700), one(0177700), "Ds", mcfisa_a },
{"seq", one(0053700), one(0177700), "$s", m68000up },
-{"seq", one(0053700), one(0177700), "Ds", mcf },
+{"seq", one(0053700), one(0177700), "Ds", mcfisa_a },
{"sf", one(0050700), one(0177700), "$s", m68000up },
-{"sf", one(0050700), one(0177700), "Ds", mcf },
+{"sf", one(0050700), one(0177700), "Ds", mcfisa_a },
{"sge", one(0056300), one(0177700), "$s", m68000up },
-{"sge", one(0056300), one(0177700), "Ds", mcf },
+{"sge", one(0056300), one(0177700), "Ds", mcfisa_a },
{"sgt", one(0057300), one(0177700), "$s", m68000up },
-{"sgt", one(0057300), one(0177700), "Ds", mcf },
+{"sgt", one(0057300), one(0177700), "Ds", mcfisa_a },
{"shi", one(0051300), one(0177700), "$s", m68000up },
-{"shi", one(0051300), one(0177700), "Ds", mcf },
+{"shi", one(0051300), one(0177700), "Ds", mcfisa_a },
{"sle", one(0057700), one(0177700), "$s", m68000up },
-{"sle", one(0057700), one(0177700), "Ds", mcf },
+{"sle", one(0057700), one(0177700), "Ds", mcfisa_a },
{"sls", one(0051700), one(0177700), "$s", m68000up },
-{"sls", one(0051700), one(0177700), "Ds", mcf },
+{"sls", one(0051700), one(0177700), "Ds", mcfisa_a },
{"slt", one(0056700), one(0177700), "$s", m68000up },
-{"slt", one(0056700), one(0177700), "Ds", mcf },
+{"slt", one(0056700), one(0177700), "Ds", mcfisa_a },
{"smi", one(0055700), one(0177700), "$s", m68000up },
-{"smi", one(0055700), one(0177700), "Ds", mcf },
+{"smi", one(0055700), one(0177700), "Ds", mcfisa_a },
{"sne", one(0053300), one(0177700), "$s", m68000up },
-{"sne", one(0053300), one(0177700), "Ds", mcf },
+{"sne", one(0053300), one(0177700), "Ds", mcfisa_a },
{"spl", one(0055300), one(0177700), "$s", m68000up },
-{"spl", one(0055300), one(0177700), "Ds", mcf },
+{"spl", one(0055300), one(0177700), "Ds", mcfisa_a },
{"st", one(0050300), one(0177700), "$s", m68000up },
-{"st", one(0050300), one(0177700), "Ds", mcf },
+{"st", one(0050300), one(0177700), "Ds", mcfisa_a },
{"svc", one(0054300), one(0177700), "$s", m68000up },
-{"svc", one(0054300), one(0177700), "Ds", mcf },
+{"svc", one(0054300), one(0177700), "Ds", mcfisa_a },
{"svs", one(0054700), one(0177700), "$s", m68000up },
-{"svs", one(0054700), one(0177700), "Ds", mcf },
+{"svs", one(0054700), one(0177700), "Ds", mcfisa_a },
-{"stop", one(0047162), one(0177777), "#w", m68000up | mcf },
+{"stop", one(0047162), one(0177777), "#w", m68000up | mcfisa_a },
-{"strldsr", two(0040347,0043374), two(0177777,0177777), "#w", mcf528x},
+{"strldsr", two(0040347,0043374), two(0177777,0177777), "#w", mcfisa_aa},
-{"subal", one(0110700), one(0170700), "*lAd", m68000up | mcf },
+{"subal", one(0110700), one(0170700), "*lAd", m68000up | mcfisa_a },
{"subaw", one(0110300), one(0170700), "*wAd", m68000up },
{"subib", one(0002000), one(0177700), "#b$s", m68000up },
{"subiw", one(0002100), one(0177700), "#w$s", m68000up },
{"subil", one(0002200), one(0177700), "#l$s", m68000up },
-{"subil", one(0002200), one(0177700), "#lDs", mcf },
+{"subil", one(0002200), one(0177700), "#lDs", mcfisa_a },
{"subqb", one(0050400), one(0170700), "Qd%s", m68000up },
{"subqw", one(0050500), one(0170700), "Qd%s", m68000up },
-{"subql", one(0050600), one(0170700), "Qd%s", m68000up | mcf },
+{"subql", one(0050600), one(0170700), "Qd%s", m68000up | mcfisa_a },
/* The sub opcode can generate the suba, subi, and subq instructions. */
{"subb", one(0050400), one(0170700), "Qd%s", m68000up },
@@ -2057,21 +2057,21 @@ const struct m68k_opcode m68k_opcodes[] =
{"subw", one(0110300), one(0170700), "*wAd", m68000up },
{"subw", one(0110100), one(0170700), "*wDd", m68000up },
{"subw", one(0110500), one(0170700), "Dd~s", m68000up },
-{"subl", one(0050600), one(0170700), "Qd%s", m68000up | mcf },
+{"subl", one(0050600), one(0170700), "Qd%s", m68000up | mcfisa_a },
{"subl", one(0002200), one(0177700), "#l$s", m68000up },
-{"subl", one(0002200), one(0177700), "#lDs", mcf },
-{"subl", one(0110700), one(0170700), "*lAd", m68000up | mcf },
-{"subl", one(0110200), one(0170700), "*lDd", m68000up | mcf },
-{"subl", one(0110600), one(0170700), "Dd~s", m68000up | mcf },
+{"subl", one(0002200), one(0177700), "#lDs", mcfisa_a },
+{"subl", one(0110700), one(0170700), "*lAd", m68000up | mcfisa_a },
+{"subl", one(0110200), one(0170700), "*lDd", m68000up | mcfisa_a },
+{"subl", one(0110600), one(0170700), "Dd~s", m68000up | mcfisa_a },
{"subxb", one(0110400), one(0170770), "DsDd", m68000up },
{"subxb", one(0110410), one(0170770), "-s-d", m68000up },
{"subxw", one(0110500), one(0170770), "DsDd", m68000up },
{"subxw", one(0110510), one(0170770), "-s-d", m68000up },
-{"subxl", one(0110600), one(0170770), "DsDd", m68000up | mcf },
+{"subxl", one(0110600), one(0170770), "DsDd", m68000up | mcfisa_a },
{"subxl", one(0110610), one(0170770), "-s-d", m68000up },
-{"swap", one(0044100), one(0177770), "Ds", m68000up | mcf },
+{"swap", one(0044100), one(0177770), "Ds", m68000up | mcfisa_a },
/* swbeg and swbegl are magic constants used on sysV68. The compiler
generates them before a switch table. They tell the debugger and
@@ -2079,10 +2079,10 @@ const struct m68k_opcode m68k_opcodes[] =
number of elements in the table. swbeg means that the entries in
the table are word (2 byte) sized, and swbegl means that the
entries in the table are longword (4 byte) sized. */
-{"swbeg", one(0045374), one(0177777), "#w", m68000up | mcf },
-{"swbegl", one(0045375), one(0177777), "#l", m68000up | mcf },
+{"swbeg", one(0045374), one(0177777), "#w", m68000up | mcfisa_a },
+{"swbegl", one(0045375), one(0177777), "#l", m68000up | mcfisa_a },
-{"tas", one(0045300), one(0177700), "$s", m68000up | mcfv4up},
+{"tas", one(0045300), one(0177700), "$s", m68000up | mcfisa_b},
#define TBL1(name,signed,round,size) \
{name, two(0174000, (signed<<11)|(!round<<10)|(size<<6)|0000400), \
@@ -2096,12 +2096,12 @@ TBL("tblsnb", "tblsnw", "tblsnl", 1, 0),
TBL("tblub", "tbluw", "tblul", 0, 1),
TBL("tblunb", "tblunw", "tblunl", 0, 0),
-{"trap", one(0047100), one(0177760), "Ts", m68000up | mcf },
+{"trap", one(0047100), one(0177760), "Ts", m68000up | mcfisa_a },
{"trapcc", one(0052374), one(0177777), "", m68020up | cpu32 },
{"trapcs", one(0052774), one(0177777), "", m68020up | cpu32 },
{"trapeq", one(0053774), one(0177777), "", m68020up | cpu32 },
-{"trapf", one(0050774), one(0177777), "", m68020up | cpu32 | mcf },
+{"trapf", one(0050774), one(0177777), "", m68020up | cpu32 | mcfisa_a },
{"trapge", one(0056374), one(0177777), "", m68020up | cpu32 },
{"trapgt", one(0057374), one(0177777), "", m68020up | cpu32 },
{"traphi", one(0051374), one(0177777), "", m68020up | cpu32 },
@@ -2118,7 +2118,7 @@ TBL("tblunb", "tblunw", "tblunl", 0, 0),
{"trapccw", one(0052372), one(0177777), "#w", m68020up|cpu32 },
{"trapcsw", one(0052772), one(0177777), "#w", m68020up|cpu32 },
{"trapeqw", one(0053772), one(0177777), "#w", m68020up|cpu32 },
-{"trapfw", one(0050772), one(0177777), "#w", m68020up|cpu32|mcf},
+{"trapfw", one(0050772), one(0177777), "#w", m68020up|cpu32|mcfisa_a},
{"trapgew", one(0056372), one(0177777), "#w", m68020up|cpu32 },
{"trapgtw", one(0057372), one(0177777), "#w", m68020up|cpu32 },
{"traphiw", one(0051372), one(0177777), "#w", m68020up|cpu32 },
@@ -2135,7 +2135,7 @@ TBL("tblunb", "tblunw", "tblunl", 0, 0),
{"trapccl", one(0052373), one(0177777), "#l", m68020up|cpu32 },
{"trapcsl", one(0052773), one(0177777), "#l", m68020up|cpu32 },
{"trapeql", one(0053773), one(0177777), "#l", m68020up|cpu32 },
-{"trapfl", one(0050773), one(0177777), "#l", m68020up|cpu32|mcf},
+{"trapfl", one(0050773), one(0177777), "#l", m68020up|cpu32|mcfisa_a},
{"trapgel", one(0056373), one(0177777), "#l", m68020up|cpu32 },
{"trapgtl", one(0057373), one(0177777), "#l", m68020up|cpu32 },
{"traphil", one(0051373), one(0177777), "#l", m68020up|cpu32 },
@@ -2151,24 +2151,24 @@ TBL("tblunb", "tblunw", "tblunl", 0, 0),
{"trapv", one(0047166), one(0177777), "", m68000up },
-{"tstb", one(0045000), one(0177700), ";b", m68020up|cpu32|mcf },
+{"tstb", one(0045000), one(0177700), ";b", m68020up|cpu32|mcfisa_a },
{"tstb", one(0045000), one(0177700), "$b", m68000up },
-{"tstw", one(0045100), one(0177700), "*w", m68020up|cpu32|mcf },
+{"tstw", one(0045100), one(0177700), "*w", m68020up|cpu32|mcfisa_a },
{"tstw", one(0045100), one(0177700), "$w", m68000up },
-{"tstl", one(0045200), one(0177700), "*l", m68020up|cpu32|mcf },
+{"tstl", one(0045200), one(0177700), "*l", m68020up|cpu32|mcfisa_a },
{"tstl", one(0045200), one(0177700), "$l", m68000up },
-{"unlk", one(0047130), one(0177770), "As", m68000up | mcf },
+{"unlk", one(0047130), one(0177770), "As", m68000up | mcfisa_a },
{"unpk", one(0100600), one(0170770), "DsDd#w", m68020up },
{"unpk", one(0100610), one(0170770), "-s-d#w", m68020up },
-{"wddatab", one(0175400), one(0177700), "~s", mcf },
-{"wddataw", one(0175500), one(0177700), "~s", mcf },
-{"wddatal", one(0175600), one(0177700), "~s", mcf },
+{"wddatab", one(0175400), one(0177700), "~s", mcfisa_a },
+{"wddataw", one(0175500), one(0177700), "~s", mcfisa_a },
+{"wddatal", one(0175600), one(0177700), "~s", mcfisa_a },
-{"wdebug", two(0175720, 03), two(0177770, 0xffff), "as", mcf },
-{"wdebug", two(0175750, 03), two(0177770, 0xffff), "ds", mcf },
+{"wdebug", two(0175720, 03), two(0177770, 0xffff), "as", mcfisa_a },
+{"wdebug", two(0175750, 03), two(0177770, 0xffff), "ds", mcfisa_a },
};
const int m68k_numopcodes = sizeof m68k_opcodes / sizeof m68k_opcodes[0];
@@ -2418,7 +2418,7 @@ const struct m68k_opcode_alias m68k_opcode_aliases[] =
{ "ftestw", "ftstw", },
{ "ftestx", "ftstx", },
- { "bitrevl", "bitrev", }, /* for mcf528x only */
+ { "bitrevl", "bitrev", },
{ "byterevl", "byterev", },
{ "ff1l", "ff1", },