Grrr. The mn10200 and mn10300 are _not_ similar enough to easily support

with a single generic configuration.  So break them up into two different
configurations.  See the individual ChangeLogs for additional detail.

6 files changed, 30 insertions, 14 deletions

diff --git a/include/ChangeLog b/include/ChangeLog
index 79b16d4..a63b82c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  3 10:33:14 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* dis-asm.h (print_insn_mn10x00): Delete declaration.
+	(print_insn_mn10200, print_insn_mn10300): Declare.
+
 Wed Oct  2 21:24:43 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* dis-asm.h (print_insn_mn10x00): Declare.
diff --git a/include/dis-asm.h b/include/dis-asm.h
index 3a05927..e38331b 100644
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -131,7 +131,8 @@ extern int print_insn_sh		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_shl		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_hppa		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_m88k		PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_mn10x00		PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_mn10200		PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_mn10300		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_ns32k		PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_big_powerpc	PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_little_powerpc	PARAMS ((bfd_vma, disassemble_info*));
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index dac3d6e..3c1c42b 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct  3 10:01:40 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* common.h: Break mn10x00 support into mn10200 and mn10300.
+
 Wed Oct  2 21:26:43 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* common.h (EM_CYGNUS_MN10x00): Define.
diff --git a/include/opcode/.Sanitize b/include/opcode/.Sanitize
index 81362b3..e9cf078 100644
--- a/include/opcode/.Sanitize
+++ b/include/opcode/.Sanitize
@@ -61,7 +61,8 @@ i960.h
 m68k.h
 m88k.h
 mips.h
-mn10x00.h
+mn10200.h
+mn10300.h
 np1.h
 ns32k.h
 pn.h
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 48dd515..56817b3 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  3 10:33:46 1996  Jeffrey A Law  (law@cygnus.com)
+
+	* mn10x00.h: Delete.
+	* mn10200.h, mn10300.h: New files.
+
 Wed Oct  2 21:31:26 1996  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10x00.h: New file.
diff --git a/include/opcode/mn10x00.h b/include/opcode/mn10300.h
index b09387f..2d780b1 100644
--- a/include/opcode/mn10x00.h
+++ b/include/opcode/mn10300.h
@@ -1,4 +1,4 @@
-/* mn10x00.h -- Header file for Matsushita 10200 and 10300 opcode table
+/* mn10300.h -- Header file for Matsushita 10300 opcode table
    Copyright 1996 Free Software Foundation, Inc.
    Written by Jeff Law, Cygnus Support
 
@@ -18,12 +18,12 @@ You should have received a copy of the GNU General Public License
 along with this file; see the file COPYING.  If not, write to the Free
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifndef MN10x00_H
-#define MN10x00_H
+#ifndef MN10300_H
+#define MN10300_H
 
-/* The opcode table is an array of struct mn10x00_opcode.  */
+/* The opcode table is an array of struct mn10300_opcode.  */
 
-struct mn10x00_opcode
+struct mn10300_opcode
 {
   /* The opcode name.  */
   const char *name;
@@ -47,13 +47,13 @@ struct mn10x00_opcode
 /* The table itself is sorted by major opcode number, and is otherwise
    in the order in which the disassembler should consider
    instructions.  */
-extern const struct mn10x00_opcode mn10x00_opcodes[];
-extern const int mn10x00_num_opcodes;
+extern const struct mn10300_opcode mn10300_opcodes[];
+extern const int mn10300_num_opcodes;
 
 
 /* The operands table is an array of struct powerpc_operand.  */
 
-struct mn10x00_operand
+struct mn10300_operand
 {
   /* The number of bits in the operand.  */
   int bits;
@@ -66,10 +66,10 @@ struct mn10x00_operand
 };
 
 /* Elements in the table are retrieved by indexing with values from
-   the operands field of the mn10x00_opcodes table.  */
+   the operands field of the mn10300_opcodes table.  */
 
-extern const struct mn10x00_operand mn10x00_operands[];
+extern const struct mn10300_operand mn10300_operands[];
 
-/* Values defined for the flags field of a struct mn10x00_operand.  */
+/* Values defined for the flags field of a struct mn10300_operand.  */
 
-#endif /* MN10x00_H */
+#endif /* MN10300_H */