diff options
| author | Nick Clifton <nickc@redhat.com> | 1997-10-14 23:09:59 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 1997-10-14 23:09:59 +0000 |
| commit | 3516c09c606241884f329c38c840060f99001e88 (patch) | |
| tree | 69af5da57e604b62e90358993e730060c55344e5 /opcodes/v850-dis.c | |
| parent | ecf4429f18ae90f29f8c75e18731295d36d96dba (diff) | |
| download | gdb-3516c09c606241884f329c38c840060f99001e88.zip gdb-3516c09c606241884f329c38c840060f99001e88.tar.gz gdb-3516c09c606241884f329c38c840060f99001e88.tar.bz2 | |
New dummy function for symbol_at_address_func field of disassemble_info
structure.
Add code to use this field in v850 disassembly.
Diffstat (limited to 'opcodes/v850-dis.c')
| -rw-r--r-- | opcodes/v850-dis.c | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/opcodes/v850-dis.c b/opcodes/v850-dis.c index 34e49e2..c43f6db 100644 --- a/opcodes/v850-dis.c +++ b/opcodes/v850-dis.c @@ -30,7 +30,11 @@ static const char *const v850_reg_names[] = static const char *const v850_sreg_names[] = { "eipc", "eipsw", "fepc", "fepsw", "ecr", "psw", "sr6", "sr7", - "sr8", "sr9", "sr10", "sr11", "sr12", "sr13", "sr14", "sr15", + "sr8", "sr9", "sr10", "sr11", "sr12", "sr13", "sr14", "sr15", +/* start-sanitize-v850e */ + "ctpc", "ctpsw", "dbpc", "dbpsw", "ctbp", "sr21", "sr22", "sr23", + "sr24", "sr25", "sr26", "sr27", "sr28", "sr29", "sr30", "sr31", +/* end-sanitize-v850e */ "sr16", "sr17", "sr18", "sr19", "sr20", "sr21", "sr22", "sr23", "sr24", "sr25", "sr26", "sr27", "sr28", "sr29", "sr30", "sr31" }; @@ -175,12 +179,35 @@ disassemble (memaddr, info, insn) case V850_OPERAND_SRG: info->fprintf_func (info->stream, "%s", v850_sreg_names[value]); break; case V850_OPERAND_CC: info->fprintf_func (info->stream, "%s", v850_cc_names[value]); break; case V850_OPERAND_EP: info->fprintf_func (info->stream, "ep"); break; - case V850_OPERAND_DISP: info->print_address_func (value + memaddr, info); break; default: info->fprintf_func (info->stream, "%d", value); break; + case V850_OPERAND_DISP: + { + bfd_vma addr = value + memaddr; + + /* On the v850 the top 8 bits of an address are used by an overlay manager. + Thus it may happen that when we are looking for a symbol to match + against an address with some of its top bits set, the search fails to + turn up an exact match. In this case we try to find an exact match + against a symbol in the lower address space, and if we find one, we + use that address. We only do this for JARL instructions however, as + we do not want to misinterpret branch instructions. */ + if (operand->bits == 22) + { + if ( ! info->symbol_at_address_func (addr, info) + && ((addr & 0xFF000000) != 0) + && info->symbol_at_address_func (addr & 0x00FFFFFF, info)) + { + addr &= 0x00FFFFFF; + } + } + info->print_address_func (addr, info); + break; + } + /* start-sanitize-v850e */ case V850E_PUSH_POP: { - static int list12_regs[32] = { 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 29, 28, 23, 22, 21, 20, 27, 26, 25, 24 }; + static int list12_regs[32] = { 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 29, 28, 23, 22, 21, 20, 27, 26, 25, 24 }; static int list18_h_regs[32] = { 19, 18, 17, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 30, 31, 29, 28, 23, 22, 21, 20, 27, 26, 25, 24 }; static int list18_l_regs[32] = { 3, 2, 1, -2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 14, 15, 13, 12, 7, 6, 5, 4, 11, 10, 9, 8 }; int * regs; @@ -357,5 +384,3 @@ print_insn_v850 (memaddr, info) /* Make sure we tell our caller how many bytes we consumed. */ return disassemble (memaddr, info, insn); } - - |