From 022fac6d2a2b74313c0262e97b280b1c7fc720f4 Mon Sep 17 00:00:00 2001 From: Thiemo Seufer Date: Tue, 2 May 2006 11:12:41 +0000 Subject: [PATCH] * mips-dis.c (print_insn_args): Force mips16 to odd addresses. (print_mips16_insn_arg): Force mips16 to odd addresses. --- opcodes/ChangeLog | 7 +++++++ opcodes/mips-dis.c | 21 ++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index c3840802d60..f4bf38383d1 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,10 @@ +2006-05-02 Thiemo Seufer + Nigel Stephens + David Ung + + * mips-dis.c (print_insn_args): Force mips16 to odd addresses. + (print_mips16_insn_arg): Force mips16 to odd addresses. + 2006-04-30 Thiemo Seufer David Ung diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c index ee1e9af0c9a..59e1824f220 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c @@ -984,6 +984,10 @@ print_insn_args (const char *d, case 'a': info->target = (((pc + 4) & ~(bfd_vma) 0x0fffffff) | (((l >> OP_SH_TARGET) & OP_MASK_TARGET) << 2)); + /* For gdb disassembler, force odd address on jalx. */ + if (info->flavour == bfd_target_unknown_flavour + && strcmp (opp->name, "jalx") == 0) + info->target |= 1; (*info->print_address_func) (info->target, info); break; @@ -1632,15 +1636,26 @@ print_mips16_insn_arg (char type, } } info->target = (baseaddr & ~((1 << shift) - 1)) + immed; + if (pcrel && branch + && info->flavour == bfd_target_unknown_flavour) + /* For gdb disassembler, maintain odd address. */ + info->target |= 1; (*info->print_address_func) (info->target, info); } } break; case 'a': - if (! use_extend) - extend = 0; - l = ((l & 0x1f) << 23) | ((l & 0x3e0) << 13) | (extend << 2); + { + int jalx = l & 0x400; + + if (! use_extend) + extend = 0; + l = ((l & 0x1f) << 23) | ((l & 0x3e0) << 13) | (extend << 2); + if (!jalx && info->flavour == bfd_target_unknown_flavour) + /* For gdb disassembler, maintain odd address. */ + l |= 1; + } info->target = ((memaddr + 4) & ~(bfd_vma) 0x0fffffff) | l; (*info->print_address_func) (info->target, info); info->insn_type = dis_jsr; -- 2.30.2