bdc4de1b24
include * dis-asm.h (struct disassemble_info): Add stop_vma field. binuti * objdump.c (disassemble_bytes): Set the stop_vma field in the disassemble_info structure when disassembling code sections with -d. * doc/binutils.texi (objdump): Document the discrepancy between -d and -D. opcodes * dis-buf.c (buffer_read_memory): Fail is stop_vma is set and the requested region lies beyond it. * bfin-dis.c (print_insn_bfin): Ignore sysop instructions when looking for 32-bit insns. * mcore-dis.c (print_insn_mcore): Disable stop_vma when reading data. * sh-dis.c (print_insn_sh): Likewise. * tic6x-dis.c (print_insn_tic6x): Disable stop_vma when reading blocks of instructions. * vax-dis.c (print_insn_vax): Check that the requested address does not clash with the stop_vma. tests * gas/arm/backslash-at.s: Add extra .byte directives so that the foo symbol does not appear to point half way through an instruction. * gas/arm/backslash-at.d: Update expected disassembly. * gas/i386/ilp32/x86-64-opcode-inval-intel.d: Likewise. * gas/i386/ilp32/x86-64-opcode-inval.d: Likewise. * gas/i386/x86-64-opcode-inval-intel.d: Likewise. * gas/i386/x86-64-opcode-inval.d: Likewise.
107 lines
3.1 KiB
C
107 lines
3.1 KiB
C
/* Disassemble from a buffer, for GNU.
|
|
Copyright (C) 1993-2015 Free Software Foundation, Inc.
|
|
|
|
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 3, or (at your option)
|
|
any later version.
|
|
|
|
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 "dis-asm.h"
|
|
#include <errno.h>
|
|
#include "opintl.h"
|
|
|
|
/* Get LENGTH bytes from info's buffer, at target address memaddr.
|
|
Transfer them to myaddr. */
|
|
int
|
|
buffer_read_memory (bfd_vma memaddr,
|
|
bfd_byte *myaddr,
|
|
unsigned int length,
|
|
struct disassemble_info *info)
|
|
{
|
|
unsigned int opb = info->octets_per_byte;
|
|
unsigned int end_addr_offset = length / opb;
|
|
unsigned int max_addr_offset = info->buffer_length / opb;
|
|
unsigned int octets = (memaddr - info->buffer_vma) * opb;
|
|
|
|
if (memaddr < info->buffer_vma
|
|
|| memaddr - info->buffer_vma > max_addr_offset
|
|
|| memaddr - info->buffer_vma + end_addr_offset > max_addr_offset
|
|
|| (info->stop_vma && (memaddr >= info->stop_vma
|
|
|| memaddr + end_addr_offset > info->stop_vma)))
|
|
/* Out of bounds. Use EIO because GDB uses it. */
|
|
return EIO;
|
|
memcpy (myaddr, info->buffer + octets, length);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Print an error message. We can assume that this is in response to
|
|
an error return from buffer_read_memory. */
|
|
|
|
void
|
|
perror_memory (int status,
|
|
bfd_vma memaddr,
|
|
struct disassemble_info *info)
|
|
{
|
|
if (status != EIO)
|
|
/* Can't happen. */
|
|
info->fprintf_func (info->stream, _("Unknown error %d\n"), status);
|
|
else
|
|
{
|
|
char buf[30];
|
|
|
|
/* Actually, address between memaddr and memaddr + len was
|
|
out of bounds. */
|
|
sprintf_vma (buf, memaddr);
|
|
info->fprintf_func (info->stream,
|
|
_("Address 0x%s is out of bounds.\n"), buf);
|
|
}
|
|
}
|
|
|
|
/* This could be in a separate file, to save miniscule amounts of space
|
|
in statically linked executables. */
|
|
|
|
/* Just print the address is hex. This is included for completeness even
|
|
though both GDB and objdump provide their own (to print symbolic
|
|
addresses). */
|
|
|
|
void
|
|
generic_print_address (bfd_vma addr, struct disassemble_info *info)
|
|
{
|
|
char buf[30];
|
|
|
|
sprintf_vma (buf, addr);
|
|
(*info->fprintf_func) (info->stream, "0x%s", buf);
|
|
}
|
|
|
|
/* Just return true. */
|
|
|
|
int
|
|
generic_symbol_at_address (bfd_vma addr ATTRIBUTE_UNUSED,
|
|
struct disassemble_info *info ATTRIBUTE_UNUSED)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
/* Just return TRUE. */
|
|
|
|
bfd_boolean
|
|
generic_symbol_is_valid (asymbol * sym ATTRIBUTE_UNUSED,
|
|
struct disassemble_info *info ATTRIBUTE_UNUSED)
|
|
{
|
|
return TRUE;
|
|
}
|