From 7d063384af231365d6f623f89f09f1af909478f8 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 13 Apr 2011 13:20:24 +0000 Subject: * v850-dis.c (disassemble): Always print a closing square brace if an opening square brace was printed. --- opcodes/ChangeLog | 5 +++++ opcodes/v850-dis.c | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'opcodes') diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 37151f9..ad85706 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2011-04-13 Nick Clifton + + * v850-dis.c (disassemble): Always print a closing square brace if + an opening square brace was printed. + 2011-04-12 Nick Clifton PR binutils/12534 diff --git a/opcodes/v850-dis.c b/opcodes/v850-dis.c index c3624b2..cf0d386 100644 --- a/opcodes/v850-dis.c +++ b/opcodes/v850-dis.c @@ -283,6 +283,7 @@ disassemble (bfd_vma memaddr, struct disassemble_info *info, int bytes_read, uns *opindex_ptr != 0; opindex_ptr++, opnum++) { + bfd_boolean square = FALSE; long value; int flag; char *prefix; @@ -323,11 +324,17 @@ disassemble (bfd_vma memaddr, struct disassemble_info *info, int bytes_read, uns } if (opnum == 1 && opnum == memop) - info->fprintf_func (info->stream, "%s[", prefix); + { + info->fprintf_func (info->stream, "%s[", prefix); + square = TRUE; + } else if (opnum > 1 && (v850_operands[*(opindex_ptr - 1)].flags & V850_OPERAND_DISP) != 0 && opnum == memop) - info->fprintf_func (info->stream, "%s[", prefix); + { + info->fprintf_func (info->stream, "%s[", prefix); + square = TRUE; + } else if (opnum > 1) info->fprintf_func (info->stream, ", %s", prefix); @@ -431,7 +438,7 @@ disassemble (bfd_vma memaddr, struct disassemble_info *info, int bytes_read, uns break; } - if (opnum == 2 && opnum == memop) + if (square) (*info->fprintf_func) (info->stream, "]"); } -- cgit v1.1