projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of VEC(static_tracepoint_marker_p)
[deliverable/binutils-gdb.git]
/
opcodes
/
avr-dis.c
diff --git
a/opcodes/avr-dis.c
b/opcodes/avr-dis.c
index 385b399f7afe57d3f8e473d27278fee152f1a366..6a37c6e637d023361f30d5ee0de9f440cad44413 100644
(file)
--- a/
opcodes/avr-dis.c
+++ b/
opcodes/avr-dis.c
@@
-1,6
+1,5
@@
/* Disassemble AVR instructions.
/* Disassemble AVR instructions.
- Copyright 1999, 2000, 2002, 2004, 2005, 2006, 2007, 2008, 2012
- Free Software Foundation, Inc.
+ Copyright (C) 1999-2018 Free Software Foundation, Inc.
Contributed by Denis Chertykov <denisc@overta.ru>
Contributed by Denis Chertykov <denisc@overta.ru>
@@
-23,9
+22,10
@@
#include "sysdep.h"
#include <assert.h>
#include "sysdep.h"
#include <assert.h>
-#include "dis
-asm
.h"
+#include "dis
assemble
.h"
#include "opintl.h"
#include "libiberty.h"
#include "opintl.h"
#include "libiberty.h"
+#include "bfd_stdint.h"
struct avr_opcodes_s
{
struct avr_opcodes_s
{
@@
-63,7
+63,7
@@
avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra
insn = (insn & 0xf) | ((insn & 0x0200) >> 5); /* Source register. */
else
insn = (insn & 0x01f0) >> 4; /* Destination register. */
insn = (insn & 0xf) | ((insn & 0x0200) >> 5); /* Source register. */
else
insn = (insn & 0x01f0) >> 4; /* Destination register. */
-
+
sprintf (buf, "r%d", insn);
break;
sprintf (buf, "r%d", insn);
break;
@@
-73,11
+73,11
@@
avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra
else
sprintf (buf, "r%d", 16 + ((insn & 0xf0) >> 4));
break;
else
sprintf (buf, "r%d", 16 + ((insn & 0xf0) >> 4));
break;
-
+
case 'w':
sprintf (buf, "r%d", 24 + ((insn & 0x30) >> 3));
break;
case 'w':
sprintf (buf, "r%d", 24 + ((insn & 0x30) >> 3));
break;
-
+
case 'a':
if (regs)
sprintf (buf, "r%d", 16 + (insn & 7));
case 'a':
if (regs)
sprintf (buf, "r%d", 16 + (insn & 7));
@@
-139,11
+139,11
@@
avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra
case 'b':
{
unsigned int x;
case 'b':
{
unsigned int x;
-
+
x = (insn & 7);
x |= (insn >> 7) & (3 << 3);
x |= (insn >> 8) & (1 << 5);
x = (insn & 7);
x |= (insn >> 7) & (3 << 3);
x |= (insn >> 8) & (1 << 5);
-
+
if (insn & 0x8)
*buf++ = 'Y';
else
if (insn & 0x8)
*buf++ = 'Y';
else
@@
-152,17
+152,17
@@
avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra
sprintf (comment, "0x%02x", x);
}
break;
sprintf (comment, "0x%02x", x);
}
break;
-
+
case 'h':
*sym = 1;
*sym_addr = ((((insn & 1) | ((insn & 0x1f0) >> 3)) << 16) | insn2) * 2;
/* See PR binutils/2454. Ideally we would like to display the hex
value of the address only once, but this would mean recoding
objdump_print_address() which would affect many targets. */
case 'h':
*sym = 1;
*sym_addr = ((((insn & 1) | ((insn & 0x1f0) >> 3)) << 16) | insn2) * 2;
/* See PR binutils/2454. Ideally we would like to display the hex
value of the address only once, but this would mean recoding
objdump_print_address() which would affect many targets. */
- sprintf (buf, "%#lx", (unsigned long) *sym_addr);
+ sprintf (buf, "%#lx", (unsigned long) *sym_addr);
strcpy (comment, comment_start);
break;
strcpy (comment, comment_start);
break;
-
+
case 'L':
{
int rel_addr = (((insn & 0xfff) ^ 0x800) - 0x800) * 2;
case 'L':
{
int rel_addr = (((insn & 0xfff) ^ 0x800) - 0x800) * 2;
@@
-185,9
+185,26
@@
avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra
break;
case 'i':
break;
case 'i':
- sprintf (buf, "0x%04X", insn2);
+ {
+ unsigned int val = insn2 | 0x800000;
+ *sym = 1;
+ *sym_addr = val;
+ sprintf (buf, "0x%04X", insn2);
+ strcpy (comment, comment_start);
+ }
break;
break;
-
+
+ case 'j':
+ {
+ unsigned int val = ((insn & 0xf) | ((insn & 0x600) >> 5)
+ | ((insn & 0x100) >> 2));
+ *sym = 1;
+ *sym_addr = val | 0x800000;
+ sprintf (buf, "0x%02x", val);
+ strcpy (comment, comment_start);
+ }
+ break;
+
case 'M':
sprintf (buf, "0x%02X", ((insn & 0xf00) >> 4) | (insn & 0xf));
sprintf (comment, "%d", ((insn & 0xf00) >> 4) | (insn & 0xf));
case 'M':
sprintf (buf, "0x%02X", ((insn & 0xf00) >> 4) | (insn & 0xf));
sprintf (comment, "%d", ((insn & 0xf00) >> 4) | (insn & 0xf));
@@
-195,10
+212,11
@@
avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra
case 'n':
sprintf (buf, "??");
case 'n':
sprintf (buf, "??");
- fprintf (stderr, _("Internal disassembler error"));
+ /* xgettext:c-format */
+ opcodes_error_handler (_("internal disassembler error"));
ok = 0;
break;
ok = 0;
break;
-
+
case 'K':
{
unsigned int x;
case 'K':
{
unsigned int x;
@@
-208,15
+226,15
@@
avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra
sprintf (comment, "%d", x);
}
break;
sprintf (comment, "%d", x);
}
break;
-
+
case 's':
sprintf (buf, "%d", insn & 7);
break;
case 's':
sprintf (buf, "%d", insn & 7);
break;
-
+
case 'S':
sprintf (buf, "%d", (insn >> 4) & 7);
break;
case 'S':
sprintf (buf, "%d", (insn >> 4) & 7);
break;
-
+
case 'P':
{
unsigned int x;
case 'P':
{
unsigned int x;
@@
-231,32
+249,36
@@
avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra
case 'p':
{
unsigned int x;
case 'p':
{
unsigned int x;
-
+
x = (insn >> 3) & 0x1f;
sprintf (buf, "0x%02x", x);
sprintf (comment, "%d", x);
}
break;
x = (insn >> 3) & 0x1f;
sprintf (buf, "0x%02x", x);
sprintf (comment, "%d", x);
}
break;
-
+
case 'E':
sprintf (buf, "%d", (insn >> 4) & 15);
break;
case 'E':
sprintf (buf, "%d", (insn >> 4) & 15);
break;
-
+
case '?':
*buf = '\0';
break;
case '?':
*buf = '\0';
break;
-
+
default:
sprintf (buf, "??");
default:
sprintf (buf, "??");
- fprintf (stderr, _("unknown constraint `%c'"), constraint);
+ /* xgettext:c-format */
+ opcodes_error_handler (_("unknown constraint `%c'"), constraint);
ok = 0;
}
return ok;
}
ok = 0;
}
return ok;
}
-static unsigned short
-avrdis_opcode (bfd_vma addr, disassemble_info *info)
+/* Read the opcode from ADDR. Return 0 in success and save opcode
+ in *INSN, otherwise, return -1. */
+
+static int
+avrdis_opcode (bfd_vma addr, disassemble_info *info, uint16_t *insn)
{
bfd_byte buffer[2];
int status;
{
bfd_byte buffer[2];
int status;
@@
-264,7
+286,10
@@
avrdis_opcode (bfd_vma addr, disassemble_info *info)
status = info->read_memory_func (addr, buffer, 2, info);
if (status == 0)
status = info->read_memory_func (addr, buffer, 2, info);
if (status == 0)
- return bfd_getl16 (buffer);
+ {
+ *insn = bfd_getl16 (buffer);
+ return 0;
+ }
info->memory_error_func (status, addr, info);
return -1;
info->memory_error_func (status, addr, info);
return -1;
@@
-274,7
+299,7
@@
avrdis_opcode (bfd_vma addr, disassemble_info *info)
int
print_insn_avr (bfd_vma addr, disassemble_info *info)
{
int
print_insn_avr (bfd_vma addr, disassemble_info *info)
{
- u
nsigned in
t insn, insn2;
+ u
int16_
t insn, insn2;
const struct avr_opcodes_s *opcode;
static unsigned int *maskptr;
void *stream = info->stream;
const struct avr_opcodes_s *opcode;
static unsigned int *maskptr;
void *stream = info->stream;
@@
-299,7
+324,7
@@
print_insn_avr (bfd_vma addr, disassemble_info *info)
comment_start = " ";
nopcodes = sizeof (avr_opcodes) / sizeof (struct avr_opcodes_s);
comment_start = " ";
nopcodes = sizeof (avr_opcodes) / sizeof (struct avr_opcodes_s);
-
+
avr_bin_masks = xmalloc (nopcodes * sizeof (unsigned int));
for (opcode = avr_opcodes, maskptr = avr_bin_masks;
avr_bin_masks = xmalloc (nopcodes * sizeof (unsigned int));
for (opcode = avr_opcodes, maskptr = avr_bin_masks;
@@
-309,7
+334,7
@@
print_insn_avr (bfd_vma addr, disassemble_info *info)
char * s;
unsigned int bin = 0;
unsigned int mask = 0;
char * s;
unsigned int bin = 0;
unsigned int mask = 0;
-
+
for (s = opcode->opcode; *s; ++s)
{
bin <<= 1;
for (s = opcode->opcode; *s; ++s)
{
bin <<= 1;
@@
-325,14
+350,19
@@
print_insn_avr (bfd_vma addr, disassemble_info *info)
initialized = 1;
}
initialized = 1;
}
- insn = avrdis_opcode (addr, info);
-
+ if (avrdis_opcode (addr, info, &insn) != 0)
+ return -1;
+
for (opcode = avr_opcodes, maskptr = avr_bin_masks;
opcode->name;
opcode++, maskptr++)
for (opcode = avr_opcodes, maskptr = avr_bin_masks;
opcode->name;
opcode++, maskptr++)
- if ((insn & *maskptr) == opcode->bin_opcode)
- break;
-
+ {
+ if ((opcode->isa == AVR_ISA_TINY) && (info->mach != bfd_mach_avrtiny))
+ continue;
+ if ((insn & *maskptr) == opcode->bin_opcode)
+ break;
+ }
+
/* Special case: disassemble `ldd r,b+0' as `ld r,b', and
`std b+0,r' as `st b,r' (next entry in the table). */
/* Special case: disassemble `ldd r,b+0' as `ld r,b', and
`std b+0,r' as `st b,r' (next entry in the table). */
@@
-354,7
+384,8
@@
print_insn_avr (bfd_vma addr, disassemble_info *info)
if (opcode->insn_size > 1)
{
if (opcode->insn_size > 1)
{
- insn2 = avrdis_opcode (addr + 2, info);
+ if (avrdis_opcode (addr + 2, info, &insn2) != 0)
+ return -1;
cmd_len = 4;
}
cmd_len = 4;
}
This page took
0.027766 seconds
and
4
git commands to generate.