Second part of ms1 to mt renaming.

[deliverable/binutils-gdb.git] / opcodes / disassemble.c

diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c
index c0ff7b4c4c546f878cfddd4239fd3713bae3f7fd..db5b90b56c26482cf58efdada2de3eba4b1bffdf 100644 (file)
--- a/opcodes/disassemble.c
+++ b/opcodes/disassemble.c
@@ -24,6 +24,7 @@
 #define ARCH_arc
 #define ARCH_arm
 #define ARCH_avr
+#define ARCH_bfin
 #define ARCH_cris
 #define ARCH_crx
 #define ARCH_d10v
@@ -53,7 +54,7 @@
 #define ARCH_mmix
 #define ARCH_mn10200
 #define ARCH_mn10300
-#define ARCH_ms1
+#define ARCH_mt
 #define ARCH_msp430
 #define ARCH_ns32k
 #define ARCH_openrisc
@@ -74,6 +75,7 @@
 #define ARCH_w65
 #define ARCH_xstormy16
 #define ARCH_xtensa
+#define ARCH_z80
 #define ARCH_z8k
 #define INCLUDE_SHMEDIA
 #endif
@@ -118,6 +120,11 @@ disassembler (abfd)
       disassemble = print_insn_avr;
       break;
 #endif
+#ifdef ARCH_bfin
+    case bfd_arch_bfin:
+      disassemble = print_insn_bfin;
+      break;
+#endif
 #ifdef ARCH_cris
     case bfd_arch_cris:
       disassemble = cris_get_disassembler (abfd);
@@ -231,9 +238,9 @@ disassembler (abfd)
       disassemble = print_insn_maxq_little;
       break;
 #endif
-#ifdef ARCH_ms1
-    case bfd_arch_ms1:
-      disassemble = print_insn_ms1;
+#ifdef ARCH_mt
+    case bfd_arch_mt:
+      disassemble = print_insn_mt;
       break;
 #endif
 #ifdef ARCH_msp430
@@ -368,6 +375,11 @@ disassembler (abfd)
       disassemble = print_insn_xtensa;
       break;
 #endif
+#ifdef ARCH_z80
+    case bfd_arch_z80:
+      disassemble = print_insn_z80;
+      break;
+#endif
 #ifdef ARCH_z8k
     case bfd_arch_z8k:
       if (bfd_get_mach(abfd) == bfd_mach_z8001)
@@ -440,14 +452,19 @@ disassemble_init_for_target (struct disassemble_info * info)
 #ifdef ARCH_tic4x
     case bfd_arch_tic4x:
       info->skip_zeroes = 32;
+      break;
 #endif
 #ifdef ARCH_m32c
     case bfd_arch_m32c:
       info->endian = BFD_ENDIAN_BIG;
-      if (info->mach == bfd_mach_m16c)
-       info->insn_sets = 1 << ISA_M16C;
-      else
-       info->insn_sets = 1 << ISA_M32C;
+      if (! info->insn_sets)
+       {
+         info->insn_sets = cgen_bitset_create (ISA_MAX);
+         if (info->mach == bfd_mach_m16c)
+           cgen_bitset_set (info->insn_sets, ISA_M16C);
+         else
+           cgen_bitset_set (info->insn_sets, ISA_M32C);
+       }
       break;
 #endif
     default: