X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fvax-dis.c;h=f58c4ad4f2d7ccdf90974a56198fb822c6a05304;hb=8df017996f662ce6ab23aea4abeb8f7ac1f62651;hp=0b96414858b61af83a5b951cd9bdbdba237a6b46;hpb=01f0fe5e0450edf168c1f612feb93cf588e4e7ea;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/vax-dis.c b/opcodes/vax-dis.c index 0b96414858..f58c4ad4f2 100644 --- a/opcodes/vax-dis.c +++ b/opcodes/vax-dis.c @@ -1,28 +1,29 @@ /* Print VAX instructions. - Copyright 1995, 1998, 2000, 2001, 2002, 2005 - Free Software Foundation, Inc. + Copyright (C) 1995-2020 Free Software Foundation, Inc. Contributed by Pauline Middelink - This program is free software; you can redistribute it and/or modify + This file is part of the GNU opcodes library. + + This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; either version 3, or (at your option) + any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + It is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "sysdep.h" #include #include -#include "sysdep.h" #include "opcode/vax.h" -#include "dis-asm.h" +#include "disassemble.h" static char *reg_names[] = { @@ -63,7 +64,7 @@ static char *entry_mask_bit[] = #define COERCE32(x) ((int) (((x) ^ 0x80000000) - 0x80000000)) #define NEXTLONG(p) \ (p += 4, FETCH_DATA (info, p), \ - (COERCE32 ((((((p[-1] << 8) + p[-2]) << 8) + p[-3]) << 8) + p[-4]))) + (COERCE32 (((((((unsigned) p[-1] << 8) + p[-2]) << 8) + p[-3]) << 8) + p[-4]))) /* Maximum length of an instruction. */ #define MAXLEN 25 @@ -74,7 +75,7 @@ struct private bfd_byte * max_fetched; bfd_byte the_buffer[MAXLEN]; bfd_vma insn_start; - jmp_buf bailout; + OPCODES_SIGJMP_BUF bailout; }; /* Make sure that bytes from INFO->PRIVATE_DATA->BUFFER (inclusive) @@ -98,7 +99,7 @@ fetch_data (struct disassemble_info *info, bfd_byte *addr) if (status != 0) { (*info->memory_error_func) (status, start, info); - longjmp (priv->bailout, 1); + OPCODES_SIGLONGJMP (priv->bailout, 1); } else priv->max_fetched = addr; @@ -116,7 +117,7 @@ static bfd_vma * entry_addr = NULL; there's no symbol table. Returns TRUE upon success, FALSE otherwise. */ static bfd_boolean -parse_disassembler_options (char * options) +parse_disassembler_options (const char *options) { const char * entry_switch = "entry:"; @@ -130,14 +131,14 @@ parse_disassembler_options (char * options) /* A guesstimate of the number of entries we will have to create. */ entry_addr_total_slots += strlen (options) / (strlen (entry_switch) + 5); - + entry_addr = realloc (entry_addr, sizeof (bfd_vma) * entry_addr_total_slots); } if (entry_addr == NULL) return FALSE; - + entry_addr[entry_addr_occupied_slots] = bfd_scan_vma (options, NULL, 0); entry_addr_occupied_slots ++; } @@ -169,21 +170,24 @@ free_entry_array (void) } } #endif -/* Check if the given address is a known function entry. Either there must - be a symbol of function type at this address, or the address must be - a forced entry point. The later helps in disassembling ROM images, because - there's no symbol table at all. Forced entry points can be given by - supplying several -M options to objdump: -M entry:0xffbb7730. */ +/* Check if the given address is a known function entry point. This is + the case if there is a symbol of the function type at this address. + We also check for synthetic symbols as these are used for PLT entries + (weak undefined symbols may not have the function type set). Finally + the address may have been forced to be treated as an entry point. The + latter helps in disassembling ROM images, because there's no symbol + table at all. Forced entry points can be given by supplying several + -M options to objdump: -M entry:0xffbb7730. */ static bfd_boolean is_function_entry (struct disassemble_info *info, bfd_vma addr) { unsigned int i; - /* Check if there's a BSF_FUNCTION symbol at our address. */ + /* Check if there's a function or PLT symbol at our address. */ if (info->symbols && info->symbols[0] - && (info->symbols[0]->flags & BSF_FUNCTION) + && (info->symbols[0]->flags & (BSF_FUNCTION | BSF_SYNTHETIC)) && addr == bfd_asymbol_value (info->symbols[0])) return TRUE; @@ -195,6 +199,22 @@ is_function_entry (struct disassemble_info *info, bfd_vma addr) return FALSE; } +/* Check if the given address is the last longword of a PLT entry. + This longword is data and depending on the value it may interfere + with disassembly of further PLT entries. We make use of the fact + PLT symbols are marked BSF_SYNTHETIC. */ +static bfd_boolean +is_plt_tail (struct disassemble_info *info, bfd_vma addr) +{ + if (info->symbols + && info->symbols[0] + && (info->symbols[0]->flags & BSF_SYNTHETIC) + && addr == bfd_asymbol_value (info->symbols[0]) + 8) + return TRUE; + + return FALSE; +} + static int print_insn_mode (const char *d, int size, @@ -220,8 +240,18 @@ print_insn_mode (const char *d, (*info->fprintf_func) (info->stream, "$0x%x", mode); break; case 0x40: /* Index: base-addr[Rn] */ - p += print_insn_mode (d, size, p0 + 1, addr + 1, info); - (*info->fprintf_func) (info->stream, "[%s]", reg_names[reg]); + { + unsigned char *q = p0 + 1; + unsigned char nextmode = NEXTBYTE (q); + if (nextmode < 0x60 || nextmode == 0x8f) + /* Literal, index, register, or immediate is invalid. In + particular don't recurse into another index mode which + might overflow the_buffer. */ + (*info->fprintf_func) (info->stream, "[invalid base]"); + else + p += print_insn_mode (d, size, p0 + 1, addr + 1, info); + (*info->fprintf_func) (info->stream, "[%s]", reg_names[reg]); + } break; case 0x50: /* Register: Rn */ (*info->fprintf_func) (info->stream, "%s", reg_names[reg]); @@ -276,6 +306,7 @@ print_insn_mode (const char *d, break; case 0xB0: /* Displacement byte deferred: *displ(Rn). */ (*info->fprintf_func) (info->stream, "*"); + /* Fall through. */ case 0xA0: /* Displacement byte: displ(Rn). */ if (reg == 0xF) (*info->print_address_func) (addr + 2 + NEXTBYTE (p), info); @@ -285,6 +316,7 @@ print_insn_mode (const char *d, break; case 0xD0: /* Displacement word deferred: *displ(Rn). */ (*info->fprintf_func) (info->stream, "*"); + /* Fall through. */ case 0xC0: /* Displacement word: displ(Rn). */ if (reg == 0xF) (*info->print_address_func) (addr + 3 + NEXTWORD (p), info); @@ -294,6 +326,7 @@ print_insn_mode (const char *d, break; case 0xF0: /* Displacement long deferred: *displ(Rn). */ (*info->fprintf_func) (info->stream, "*"); + /* Fall through. */ case 0xE0: /* Displacement long: displ(Rn). */ if (reg == 0xF) (*info->print_address_func) (addr + 5 + NEXTLONG (p), info); @@ -375,14 +408,15 @@ print_insn_vax (bfd_vma memaddr, disassemble_info *info) parsed_disassembler_options = TRUE; } - if (setjmp (priv.bailout) != 0) + if (OPCODES_SIGSETJMP (priv.bailout) != 0) /* Error return. */ return -1; argp = NULL; /* Check if the info buffer has more than one byte left since the last opcode might be a single byte with no argument data. */ - if (info->buffer_length - (memaddr - info->buffer_vma) > 1) + if (info->buffer_length - (memaddr - info->buffer_vma) > 1 + && (info->stop_vma == 0 || memaddr < (info->stop_vma - 1))) { FETCH_DATA (info, buffer + 2); } @@ -410,6 +444,19 @@ print_insn_vax (bfd_vma memaddr, disassemble_info *info) return 2; } + /* Decode PLT entry offset longword. */ + if (is_plt_tail (info, memaddr)) + { + int offset; + + FETCH_DATA (info, buffer + 4); + offset = ((unsigned) buffer[3] << 24 | buffer[2] << 16 + | buffer[1] << 8 | buffer[0]); + (*info->fprintf_func) (info->stream, ".long 0x%08x", offset); + + return 4; + } + for (votp = &votstrs[0]; votp->name[0]; votp++) { vax_opcodeT opcode = votp->detail.code;