import insight-2000-02-04 snapshot (2nd try)

[external/binutils.git] / opcodes / disassemble.c

diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c
index 0745854..b961be3 100644 (file)
--- a/opcodes/disassemble.c
+++ b/opcodes/disassemble.c
@@ -1,5 +1,5 @@
 /* Select disassembly routine for specified architecture.
-   Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,36 +24,35 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define ARCH_arc
 #define ARCH_arm
 #define ARCH_d10v
-/* start-sanitize-d30v */
 #define ARCH_d30v
-/* end-sanitize-d30v */
 #define ARCH_h8300
 #define ARCH_h8500
 #define ARCH_hppa
 #define ARCH_i386
 #define ARCH_i960
+#define ARCH_fr30
 #define ARCH_m32r
 #define ARCH_m68k
 #define ARCH_m88k
+#define ARCH_mcore
 #define ARCH_mips
 #define ARCH_mn10200
 #define ARCH_mn10300
 #define ARCH_ns32k
+#define ARCH_pj
 #define ARCH_powerpc
 #define ARCH_rs6000
 #define ARCH_sh
 #define ARCH_sparc
-/* start-sanitize-tic80 */
+#define ARCH_tic30
 #define ARCH_tic80
-/* end-sanitize-tic80 */
-/* start-sanitize-sky */
-#define ARCH_txvu
-/* end-sanitize-sky */
 #define ARCH_v850
+#define ARCH_vax
 #define ARCH_w65
 #define ARCH_z8k
 #endif
 
+
 disassembler_ftype
 disassembler (abfd)
      bfd *abfd;
@@ -97,13 +96,11 @@ disassembler (abfd)
       disassemble = print_insn_d10v;
       break;
 #endif
-/* start-sanitize-d30v */
 #ifdef ARCH_d30v
     case bfd_arch_d30v:
       disassemble = print_insn_d30v;
       break;
 #endif
-/* end-sanitize-d30v */
 #ifdef ARCH_h8300
     case bfd_arch_h8300:
       if (bfd_get_mach(abfd) == bfd_mach_h8300h)
@@ -126,7 +123,10 @@ disassembler (abfd)
 #endif
 #ifdef ARCH_i386
     case bfd_arch_i386:
-      disassemble = print_insn_i386;
+      if (bfd_get_mach (abfd) == bfd_mach_i386_i386_intel_syntax)
+        disassemble = print_insn_i386_intel;
+      else
+        disassemble = print_insn_i386_att;
       break;
 #endif
 #ifdef ARCH_i960
@@ -134,6 +134,11 @@ disassembler (abfd)
       disassemble = print_insn_i960;
       break;
 #endif
+#ifdef ARCH_fr30
+    case bfd_arch_fr30:
+      disassemble = print_insn_fr30;
+      break;
+#endif
 #ifdef ARCH_m32r
     case bfd_arch_m32r:
       disassemble = print_insn_m32r;
@@ -154,6 +159,11 @@ disassembler (abfd)
       disassemble = print_insn_ns32k;
       break;
 #endif
+#ifdef ARCH_mcore
+    case bfd_arch_mcore:
+      disassemble = print_insn_mcore;
+      break;
+#endif
 #ifdef ARCH_mips
     case bfd_arch_mips:
       if (bfd_big_endian (abfd))
@@ -172,6 +182,11 @@ disassembler (abfd)
       disassemble = print_insn_mn10300;
       break;
 #endif
+#ifdef ARCH_pj
+    case bfd_arch_pj:
+      disassemble = print_insn_pj;
+      break;
+#endif
 #ifdef ARCH_powerpc
     case bfd_arch_powerpc:
       if (bfd_big_endian (abfd))
@@ -198,20 +213,16 @@ disassembler (abfd)
       disassemble = print_insn_sparc;
       break;
 #endif
-/* start-sanitize-tic80 */
+#ifdef ARCH_tic30
+    case bfd_arch_tic30:
+      disassemble = print_insn_tic30;
+      break;
+#endif
 #ifdef ARCH_tic80
     case bfd_arch_tic80:
       disassemble = print_insn_tic80;
       break;
 #endif
-/* end-sanitize-tic80 */
-/* start-sanitize-sky */
-#ifdef ARCH_txvu
-    case bfd_arch_txvu:
-      disassemble = print_insn_txvu;
-      break;
-#endif
-/* end-sanitize-sky */
 #ifdef ARCH_v850
     case bfd_arch_v850:
       disassemble = print_insn_v850;
@@ -230,9 +241,23 @@ disassembler (abfd)
        disassemble = print_insn_z8002;
       break;
 #endif
+#ifdef ARCH_vax
+    case bfd_arch_vax:
+      disassemble = print_insn_vax;
+      break;
+#endif
     default:
       return 0;
     }
   return disassemble;
 }
 
+void
+disassembler_usage (FILE * stream)
+{
+#ifdef ARCH_arm
+  print_arm_disassembler_options (stream);
+#endif
+  
+  return;
+}