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

(print_insn_xtensa): Fix call to fetch_data.
This commit is contained in:
Bob Wilson 2003-10-01 00:40:22 +00:00
parent 6464e7db62
commit 118fecd307
2 changed files with 9 additions and 6 deletions

View File

@ -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> 2003-09-30 Chris Demetriou <cgd@broadcom.com>
* mips-dis.c (mips_arch_choices): Add entry for "mips64r2" * mips-dis.c (mips_arch_choices): Add entry for "mips64r2"

View File

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