* xtensa-dis.c (fetch_data): Remove numBytes parameter.

        (print_insn_xtensa): Fix call to fetch_data.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index e102fc641454e1bee1e338f7d9a64bff2b4217eb..0397bef270956b748bdd4df1ceeb1b62afa01a3b 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-30  Bob Wilson  <bob.wilson@acm.org>
+
+       * xtensa-dis.c (fetch_data): Remove numBytes parameter.
+       (print_insn_xtensa): Fix call to fetch_data.
+
 2003-09-30  Chris Demetriou  <cgd@broadcom.com>
 
        * mips-dis.c (mips_arch_choices): Add entry for "mips64r2"

diff --git a/opcodes/xtensa-dis.c b/opcodes/xtensa-dis.c
index bf5f5bfa192c60d9add39a2ecf8458c289d3f144..8c310854a8a98b7575219a32bb1136c6fa003f00 100644 (file)
--- a/opcodes/xtensa-dis.c
+++ b/opcodes/xtensa-dis.c
@@ -337,7 +337,7 @@ static char* state_names[256] =
 int show_raw_fields;
 
 static int fetch_data
-  PARAMS ((struct disassemble_info *info, bfd_vma memaddr, int numBytes));
+  PARAMS ((struct disassemble_info *info, bfd_vma memaddr));
 static void print_xtensa_operand
   PARAMS ((bfd_vma, struct disassemble_info *, xtensa_operand,
           unsigned operand_val, int print_sr_name));
@@ -348,15 +348,13 @@ struct dis_private {
 };
 
 static int
-fetch_data (info, memaddr, numBytes)
+fetch_data (info, memaddr)
      struct disassemble_info *info;
      bfd_vma memaddr;
-     int numBytes;
 {
   int length, status = 0;
   struct dis_private *priv = (struct dis_private *) info->private_data;
-  int insn_size = (numBytes != 0 ? numBytes :
-                  xtensa_insn_maxlength (xtensa_default_isa));
+  int insn_size = xtensa_insn_maxlength (xtensa_default_isa);
 
   /* Read the maximum instruction size, padding with zeros if we go past
      the end of the text section.  This code will automatically adjust
@@ -475,7 +473,7 @@ print_insn_xtensa (memaddr, info)
   isa = xtensa_default_isa;
 
   /* Fetch the maximum size instruction.  */
-  bytes_fetched = fetch_data (info, memaddr, 0);
+  bytes_fetched = fetch_data (info, memaddr);
 
   /* Copy the bytes into the decode buffer.  */
   memset (insn_buffer, 0, (xtensa_insnbuf_size (isa) *