aboutsummaryrefslogtreecommitdiff
path: root/opcodes/dis-buf.c
diff options
context:
space:
mode:
Diffstat (limited to 'opcodes/dis-buf.c')
-rw-r--r--opcodes/dis-buf.c76
1 files changed, 23 insertions, 53 deletions
diff --git a/opcodes/dis-buf.c b/opcodes/dis-buf.c
index b87aeda..c2589ba 100644
--- a/opcodes/dis-buf.c
+++ b/opcodes/dis-buf.c
@@ -2,19 +2,20 @@
Copyright 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005
Free Software Foundation, Inc.
-This program 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.
+ This program 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.
-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.
+ 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.
-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. */
+ 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"
@@ -24,11 +25,10 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
/* Get LENGTH bytes from info's buffer, at target address memaddr.
Transfer them to myaddr. */
int
-buffer_read_memory (memaddr, myaddr, length, info)
- bfd_vma memaddr;
- bfd_byte *myaddr;
- unsigned int length;
- struct disassemble_info *info;
+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;
@@ -46,11 +46,11 @@ buffer_read_memory (memaddr, myaddr, length, info)
/* Print an error message. We can assume that this is in response to
an error return from buffer_read_memory. */
+
void
-perror_memory (status, memaddr, info)
- int status;
- bfd_vma memaddr;
- struct disassemble_info *info;
+perror_memory (int status,
+ bfd_vma memaddr,
+ struct disassemble_info *info)
{
if (status != EIO)
/* Can't happen. */
@@ -75,9 +75,7 @@ perror_memory (status, memaddr, info)
addresses). */
void
-generic_print_address (addr, info)
- bfd_vma addr;
- struct disassemble_info *info;
+generic_print_address (bfd_vma addr, struct disassemble_info *info)
{
char buf[30];
@@ -85,39 +83,11 @@ generic_print_address (addr, info)
(*info->fprintf_func) (info->stream, "0x%s", buf);
}
-#if 0
-/* Just concatenate the address as hex. This is included for
- completeness even though both GDB and objdump provide their own (to
- print symbolic addresses). */
-
-void generic_strcat_address PARAMS ((bfd_vma, char *, int));
-
-void
-generic_strcat_address (addr, buf, len)
- bfd_vma addr;
- char *buf;
- int len;
-{
- if (buf != (char *)NULL && len > 0)
- {
- char tmpBuf[30];
-
- sprintf_vma (tmpBuf, addr);
- if ((strlen (buf) + strlen (tmpBuf)) <= (unsigned int) len)
- strcat (buf, tmpBuf);
- else
- strncat (buf, tmpBuf, (len - strlen(buf)));
- }
- return;
-}
-#endif
-
/* Just return true. */
int
-generic_symbol_at_address (addr, info)
- bfd_vma addr ATTRIBUTE_UNUSED;
- struct disassemble_info *info ATTRIBUTE_UNUSED;
+generic_symbol_at_address (bfd_vma addr ATTRIBUTE_UNUSED,
+ struct disassemble_info *info ATTRIBUTE_UNUSED)
{
return 1;
}