est of the changes for Coldfire V4

3 files changed, 53 insertions, 26 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7d5072dbf5e..5b21a5c8b42 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-06  Igor Shevlyakov  <igor@windriver.com>
+
+	* m68k-dis.c (print_insn_m68k): Recognize Coldfire CPUs
+	so command line switches will work.
+
 2001-03-05  Dave Brolley  <brolley@redhat.com>
 
 	* fr30-asm.c: Regenerate.
diff --git a/opcodes/m68k-dis.c b/opcodes/m68k-dis.c
index 7f4b1104744..c41cb4b5484 100644
--- a/opcodes/m68k-dis.c
+++ b/opcodes/m68k-dis.c
@@ -1,5 +1,5 @@
 /* Print Motorola 68k instructions.
-   Copyright 1986, 87, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
+   Copyright 1986, 87, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001
    Free Software Foundation, Inc.
 
 This file is free software; you can redistribute it and/or modify
@@ -45,14 +45,18 @@ static int
 print_insn_arg PARAMS ((const char *, unsigned char *, unsigned char *,
 			bfd_vma, disassemble_info *));
 
-CONST char * CONST fpcr_names[] = {
-  "", "%fpiar", "%fpsr", "%fpiar/%fpsr", "%fpcr",
-  "%fpiar/%fpcr", "%fpsr/%fpcr", "%fpiar/%fpsr/%fpcr"};
+CONST char * CONST fpcr_names[] =
+  {
+    "", "%fpiar", "%fpsr", "%fpiar/%fpsr", "%fpcr",
+    "%fpiar/%fpcr", "%fpsr/%fpcr", "%fpiar/%fpsr/%fpcr"
+  };
 
-static char *const reg_names[] = {
-  "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
-  "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%fp", "%sp",
-  "%ps", "%pc"};
+static char *const reg_names[] =
+  {
+    "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
+    "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%fp", "%sp",
+    "%ps", "%pc"
+  };
 
 /* Sign-extend an (unsigned char). */
 #if __STDC__ == 1
@@ -178,7 +182,7 @@ print_insn_m68k (memaddr, info)
   unsigned char *save_p;
   register const char *d;
   register unsigned long bestmask;
-  const struct m68k_opcode *best = 0;
+  const struct m68k_opcode *best;
   unsigned int arch_mask;
   struct private priv;
   bfd_byte *buffer = priv.the_buffer;
@@ -228,6 +232,7 @@ print_insn_m68k (memaddr, info)
     /* Error return.  */
     return -1;
 
+  best = NULL;
   switch (info->mach)
     {
     default:
@@ -255,6 +260,18 @@ print_insn_m68k (memaddr, info)
     case bfd_mach_m68060:
       arch_mask = m68060;
       break;
+    case bfd_mach_mcf5200:
+      arch_mask = mcf5200;
+      break;
+    case bfd_mach_mcf5206e:
+      arch_mask = mcf5206e;
+      break;
+    case bfd_mach_mcf5307:
+      arch_mask = mcf5407;
+      break;
+    case bfd_mach_mcf5407:
+      arch_mask = mcf5407;
+      break;
     }
 
   arch_mask |= m68881 | m68851;
@@ -319,7 +336,7 @@ print_insn_m68k (memaddr, info)
 	}
     }
 
-  if (best == 0)
+  if (best == NULL)
     goto invalid;
 
   /* Point at first word of argument data,
diff --git a/opcodes/po/opcodes.pot b/opcodes/po/opcodes.pot
index f7de22b6dc7..01365420061 100644
--- a/opcodes/po/opcodes.pot
+++ b/opcodes/po/opcodes.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-18 14:44-0800\n"
+"POT-Creation-Date: 2001-03-06 12:07-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,7 +64,7 @@ msgstr ""
 msgid "unrecognized keyword/register name"
 msgstr ""
 
-#: cgen-asm.c:332 fr30-ibld.c:232 m32r-ibld.c:232
+#: cgen-asm.c:332 fr30-ibld.c:172 m32r-ibld.c:172
 #, c-format
 msgid "operand out of range (%ld not between %ld and %ld)"
 msgstr ""
@@ -96,8 +96,8 @@ msgid "Unrecognized field %d while parsing.\n"
 msgstr ""
 
 #. We couldn't parse it.
-#: fr30-asm.c:369 fr30-asm.c:373 fr30-asm.c:449 m32r-asm.c:377 m32r-asm.c:381
-#: m32r-asm.c:457
+#: fr30-asm.c:369 fr30-asm.c:373 fr30-asm.c:458 fr30-asm.c:552 m32r-asm.c:377
+#: m32r-asm.c:381 m32r-asm.c:466 m32r-asm.c:560
 msgid "unrecognized instruction"
 msgstr ""
 
@@ -106,16 +106,21 @@ msgstr ""
 msgid "syntax error (expected char `%c', found `%c')"
 msgstr ""
 
-#: fr30-asm.c:443 m32r-asm.c:451
+#: fr30-asm.c:424 m32r-asm.c:432
+#, c-format
+msgid "syntax error (expected char `%c', found end of instruction)"
+msgstr ""
+
+#: fr30-asm.c:452 m32r-asm.c:460
 msgid "junk at end of line"
 msgstr ""
 
-#: fr30-asm.c:551 m32r-asm.c:559
+#: fr30-asm.c:563 m32r-asm.c:571
 #, c-format
 msgid "bad instruction `%.50s...'"
 msgstr ""
 
-#: fr30-asm.c:554 m32r-asm.c:562
+#: fr30-asm.c:566 m32r-asm.c:574
 #, c-format
 msgid "bad instruction `%.50s'"
 msgstr ""
@@ -130,37 +135,37 @@ msgstr ""
 msgid "Unrecognized field %d while printing insn.\n"
 msgstr ""
 
-#: fr30-ibld.c:216 m32r-ibld.c:216
+#: fr30-ibld.c:156 m32r-ibld.c:156
 #, c-format
 msgid "operand out of range (%lu not between 0 and %lu)"
 msgstr ""
 
-#: fr30-ibld.c:790 m32r-ibld.c:719
+#: fr30-ibld.c:702 m32r-ibld.c:631
 #, c-format
 msgid "Unrecognized field %d while building insn.\n"
 msgstr ""
 
-#: fr30-ibld.c:994 m32r-ibld.c:849
+#: fr30-ibld.c:906 m32r-ibld.c:761
 #, c-format
 msgid "Unrecognized field %d while decoding insn.\n"
 msgstr ""
 
-#: fr30-ibld.c:1138 m32r-ibld.c:954
+#: fr30-ibld.c:1050 m32r-ibld.c:866
 #, c-format
 msgid "Unrecognized field %d while getting int operand.\n"
 msgstr ""
 
-#: fr30-ibld.c:1267 m32r-ibld.c:1044
+#: fr30-ibld.c:1179 m32r-ibld.c:956
 #, c-format
 msgid "Unrecognized field %d while getting vma operand.\n"
 msgstr ""
 
-#: fr30-ibld.c:1396 m32r-ibld.c:1137
+#: fr30-ibld.c:1308 m32r-ibld.c:1049
 #, c-format
 msgid "Unrecognized field %d while setting int operand.\n"
 msgstr ""
 
-#: fr30-ibld.c:1518 m32r-ibld.c:1223
+#: fr30-ibld.c:1430 m32r-ibld.c:1135
 #, c-format
 msgid "Unrecognized field %d while setting vma operand.\n"
 msgstr ""
@@ -205,12 +210,12 @@ msgstr ""
 msgid "unknown\t0x%04x"
 msgstr ""
 
-#: m68k-dis.c:412
+#: m68k-dis.c:429
 #, c-format
 msgid "<internal error in opcode table: %s %s>\n"
 msgstr ""
 
-#: m68k-dis.c:990
+#: m68k-dis.c:1007
 #, c-format
 msgid "<function code %d>"
 msgstr ""