* sim-base.h (sim_state_base): Move `magic' to end of struct.

[deliverable/binutils-gdb.git] / include / dis-asm.h

diff --git a/include/dis-asm.h b/include/dis-asm.h
index d78419b01bdbf002fa1d63563bf43a6bd1b0d20a..a16ca00acea1d1088e31aeafdaad31863f2fb386 100644 (file)
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -43,6 +43,8 @@ typedef struct disassemble_info {
   /* Target description.  We could replace this with a pointer to the bfd,
      but that would require one.  There currently isn't any such requirement
      so to avoid introducing one we record these explicitly.  */
+  /* The bfd_flavour.  This can be bfd_target_unknown_flavour.  */
+  enum bfd_flavour flavour;
   /* The bfd_arch value.  */
   enum bfd_architecture arch;
   /* The bfd_mach value.  */
@@ -115,8 +117,7 @@ extern int print_insn_h8300         PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_h8300h           PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_h8300s           PARAMS ((bfd_vma, disassemble_info*));
 extern int print_insn_h8500            PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_alpha_osf                PARAMS ((bfd_vma, disassemble_info*));
-extern int print_insn_alpha_vms                PARAMS ((bfd_vma, disassemble_info*));
+extern int print_insn_alpha            PARAMS ((bfd_vma, disassemble_info*));
 /* start-sanitize-arc */
 extern disassembler_ftype arc_get_disassembler PARAMS ((int, int));
 /* end-sanitize-arc */
@@ -129,7 +130,12 @@ extern int print_insn_i960         PARAMS ((bfd_vma, disassemble_info*));
 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*));
+/* start-sanitize-m32r */
+extern int print_insn_m32r             PARAMS ((bfd_vma, disassemble_info*));
+/* end-sanitize-m32r */
 extern int print_insn_m88k             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*));
@@ -138,6 +144,9 @@ extern int print_insn_w65           PARAMS ((bfd_vma, disassemble_info*));
 /* start-sanitize-d10v */
 extern int print_insn_d10v             PARAMS ((bfd_vma, disassemble_info*));
 /* end-sanitize-d10v */
+/* start-sanitize-v850 */
+extern int print_insn_v850             PARAMS ((bfd_vma, disassemble_info*));
+/* end-sanitize-v850 */
 
 /* Fetch the disassembler for a given BFD, if that support is available.  */
 extern disassembler_ftype disassembler PARAMS ((bfd *));
@@ -165,6 +174,7 @@ extern void generic_print_address
 /* Macro to initialize a disassemble_info struct.  This should be called
    by all applications creating such a struct.  */
 #define INIT_DISASSEMBLE_INFO(INFO, STREAM, FPRINTF_FUNC) \
+  (INFO).flavour = bfd_target_unknown_flavour, \
   (INFO).arch = bfd_arch_unknown, \
   (INFO).mach = 0, \
   (INFO).endian = BFD_ENDIAN_UNKNOWN, \