Have objdump's --help switch document PPC -M options.

diff --git a/include/ChangeLog b/include/ChangeLog
index e018f1e..d252c12 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-04  Nick Clifton  <nickc@redhat.com>
+
+       * dis-asm.h (print_ppc_disassembler_options): Prototype.
+
 2002-08-28  Michael Hayes <m.hayes@elec.canterbury.ac.nz>
 
        * coff/internal.h: Add new relocation types.

diff --git a/include/dis-asm.h b/include/dis-asm.h
index 0109068..ea74b99 100644 (file)
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -243,6 +243,7 @@ extern int print_insn_frv           PARAMS ((bfd_vma, disassemble_info *));
 extern disassembler_ftype arc_get_disassembler PARAMS ((void *));
 extern disassembler_ftype cris_get_disassembler PARAMS ((bfd *));
 
+extern void print_ppc_disassembler_options PARAMS ((FILE *));
 extern void print_arm_disassembler_options PARAMS ((FILE *));
 extern void parse_arm_disassembler_option  PARAMS ((char *));
 extern int  get_arm_regname_num_options    PARAMS ((void));

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7f3dfb4..9f0d0d1 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,11 @@
 2002-09-04  Nick Clifton  <nickc@redhat.com>
 
+       * disassemble.c (disassembler_usage): Add invocation of
+       print_ppc_disassembler_options.
+        * ppc-dis.c (print_ppc_disassembler_options): New function.
+
+2002-09-04  Nick Clifton  <nickc@redhat.com>
+
        * ppc-opc.c: The BookE implementations of the TLBWE and TLBRE
        instructions do not take any arguments.
 

diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c
index 4d78a73..4bd0d89 100644 (file)
--- a/opcodes/disassemble.c
+++ b/opcodes/disassemble.c
@@ -367,6 +367,9 @@ disassembler_usage (stream)
 #ifdef ARCH_arm
   print_arm_disassembler_options (stream);
 #endif
+#ifdef ARCH_powerpc
+  print_ppc_disassembler_options (stream);
+#endif
 
   return;
 }

diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index bd4dfac..cc937db 100644 (file)
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -296,3 +296,18 @@ print_insn_powerpc (memaddr, info, bigendian, dialect)
 
   return 4;
 }
+
+void
+print_ppc_disassembler_options (FILE * stream)
+{
+  fprintf (stream, "\n\
+The following PPC specific disassembler options are supported for use with\n\
+the -M switch:\n");
+  
+  fprintf (stream, "  booke|booke32|booke64    Disassemble the BookE instructions\n");
+  fprintf (stream, "  e500|e500x2              Disassemble the e500 instructions\n");
+  fprintf (stream, "  efs                      Disassemble the EFS instructions\n");
+  fprintf (stream, "  power4                   Disassemble the Power4 instructions\n");
+  fprintf (stream, "  32                       Do not disassemble 64-bit instructions\n");
+  fprintf (stream, "  64                       Allow disassembly of 64-bit instructions\n");
+}