X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=opcodes%2Favr-dis.c;h=6a37c6e637d023361f30d5ee0de9f440cad44413;hb=73e8dc90a8a94bc52e29596b1cc176b882fbbc8e;hp=4598cab4145cc20ca6464be96cb45c76d810ccfd;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/avr-dis.c b/opcodes/avr-dis.c index 4598cab414..6a37c6e637 100644 --- a/opcodes/avr-dis.c +++ b/opcodes/avr-dis.c @@ -1,72 +1,69 @@ /* Disassemble AVR instructions. - Copyright 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. Contributed by Denis Chertykov -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 file is part of libopcodes. -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 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. -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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 #include "sysdep.h" -#include "dis-asm.h" +#include +#include "disassemble.h" #include "opintl.h" - +#include "libiberty.h" +#include "bfd_stdint.h" struct avr_opcodes_s { char *name; char *constraints; char *opcode; - int insn_size; /* in words */ + int insn_size; /* In words. */ int isa; unsigned int bin_opcode; - unsigned int bin_mask; }; #define AVR_INSN(NAME, CONSTR, OPCODE, SIZE, ISA, BIN) \ -{#NAME, CONSTR, OPCODE, SIZE, ISA, BIN, 0}, +{#NAME, CONSTR, OPCODE, SIZE, ISA, BIN}, -struct avr_opcodes_s avr_opcodes[] = +const struct avr_opcodes_s avr_opcodes[] = { #include "opcode/avr.h" - {NULL, NULL, NULL, 0, 0, 0, 0} + {NULL, NULL, NULL, 0, 0, 0} }; -static int avr_operand PARAMS ((unsigned int, unsigned int, - unsigned int, int, char *, char *, int)); +static const char * comment_start = "0x"; static int -avr_operand (insn, insn2, pc, constraint, buf, comment, regs) - unsigned int insn; - unsigned int insn2; - unsigned int pc; - int constraint; - char *buf; - char *comment; - int regs; +avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constraint, + char *opcode_str, char *buf, char *comment, int regs, int *sym, bfd_vma *sym_addr) { int ok = 1; + *sym = 0; switch (constraint) { /* Any register operand. */ case 'r': if (regs) - insn = (insn & 0xf) | ((insn & 0x0200) >> 5); /* source register */ + insn = (insn & 0xf) | ((insn & 0x0200) >> 5); /* Source register. */ else - insn = (insn & 0x01f0) >> 4; /* destination register */ - + insn = (insn & 0x01f0) >> 4; /* Destination register. */ + sprintf (buf, "r%d", insn); break; @@ -76,11 +73,11 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs) else sprintf (buf, "r%d", 16 + ((insn & 0xf0) >> 4)); break; - + case 'w': sprintf (buf, "r%d", 24 + ((insn & 0x30) >> 3)); break; - + case 'a': if (regs) sprintf (buf, "r%d", 16 + (insn & 7)); @@ -112,7 +109,7 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs) case 0x100e: xyz = "-X"; break; default: xyz = "??"; ok = 0; } - sprintf (buf, xyz); + strcpy (buf, xyz); if (AVR_UNDEF_P (insn)) sprintf (comment, _("undefined")); @@ -121,8 +118,19 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs) case 'z': *buf++ = 'Z'; - if (insn & 0x1) - *buf++ = '+'; + + /* Check for post-increment. */ + char *s; + for (s = opcode_str; *s; ++s) + { + if (*s == '+') + { + if (insn & (1 << (15 - (s - opcode_str)))) + *buf++ = '+'; + break; + } + } + *buf = '\0'; if (AVR_UNDEF_P (insn)) sprintf (comment, _("undefined")); @@ -131,11 +139,11 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs) case 'b': { unsigned int x; - + x = (insn & 7); x |= (insn >> 7) & (3 << 3); x |= (insn >> 8) & (1 << 5); - + if (insn & 0x8) *buf++ = 'Y'; else @@ -144,32 +152,59 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs) sprintf (comment, "0x%02x", x); } break; - + case 'h': - sprintf (buf, "0x%x", - ((((insn & 1) | ((insn & 0x1f0) >> 3)) << 16) | insn2) * 2); + *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); + strcpy (comment, comment_start); break; - + case 'L': { int rel_addr = (((insn & 0xfff) ^ 0x800) - 0x800) * 2; sprintf (buf, ".%+-8d", rel_addr); - sprintf (comment, "0x%x", pc + 2 + rel_addr); + *sym = 1; + *sym_addr = pc + 2 + rel_addr; + strcpy (comment, comment_start); } break; case 'l': { int rel_addr = ((((insn >> 3) & 0x7f) ^ 0x40) - 0x40) * 2; + sprintf (buf, ".%+-8d", rel_addr); - sprintf (comment, "0x%x", pc + 2 + rel_addr); + *sym = 1; + *sym_addr = pc + 2 + rel_addr; + strcpy (comment, comment_start); } 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; + + 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)); @@ -177,10 +212,11 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs) case 'n': sprintf (buf, "??"); - fprintf (stderr, _("Internal disassembler error")); + /* xgettext:c-format */ + opcodes_error_handler (_("internal disassembler error")); ok = 0; break; - + case 'K': { unsigned int x; @@ -190,18 +226,19 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs) sprintf (comment, "%d", x); } break; - + case 's': sprintf (buf, "%d", insn & 7); break; - + case 'S': sprintf (buf, "%d", (insn >> 4) & 7); break; - + case 'P': { unsigned int x; + x = (insn & 0xf); x |= (insn >> 5) & 0x30; sprintf (buf, "0x%02x", x); @@ -212,69 +249,92 @@ avr_operand (insn, insn2, pc, constraint, buf, comment, regs) case 'p': { unsigned int x; - + x = (insn >> 3) & 0x1f; sprintf (buf, "0x%02x", x); sprintf (comment, "%d", x); } break; - + + case 'E': + sprintf (buf, "%d", (insn >> 4) & 15); + break; + case '?': *buf = '\0'; break; - + default: sprintf (buf, "??"); - fprintf (stderr, _("unknown constraint `%c'"), constraint); + /* xgettext:c-format */ + opcodes_error_handler (_("unknown constraint `%c'"), constraint); ok = 0; } return ok; } -static unsigned short avrdis_opcode PARAMS ((bfd_vma, disassemble_info *)); +/* Read the opcode from ADDR. Return 0 in success and save opcode + in *INSN, otherwise, return -1. */ -static unsigned short -avrdis_opcode (addr, info) - bfd_vma addr; - disassemble_info *info; +static int +avrdis_opcode (bfd_vma addr, disassemble_info *info, uint16_t *insn) { bfd_byte buffer[2]; int status; - status = info->read_memory_func(addr, buffer, 2, info); - if (status != 0) + + status = info->read_memory_func (addr, buffer, 2, info); + + if (status == 0) { - info->memory_error_func(status, addr, info); - return -1; + *insn = bfd_getl16 (buffer); + return 0; } - return bfd_getl16 (buffer); + + info->memory_error_func (status, addr, info); + return -1; } int -print_insn_avr(addr, info) - bfd_vma addr; - disassemble_info *info; +print_insn_avr (bfd_vma addr, disassemble_info *info) { - unsigned int insn, insn2; - struct avr_opcodes_s *opcode; + uint16_t insn, insn2; + const struct avr_opcodes_s *opcode; + static unsigned int *maskptr; void *stream = info->stream; fprintf_ftype prin = info->fprintf_func; + static unsigned int *avr_bin_masks; static int initialized; int cmd_len = 2; int ok = 0; char op1[20], op2[20], comment1[40], comment2[40]; + int sym_op1 = 0, sym_op2 = 0; + bfd_vma sym_addr1, sym_addr2; + if (!initialized) { - initialized = 1; - - for (opcode = avr_opcodes; opcode->name; opcode++) + unsigned int nopcodes; + + /* PR 4045: Try to avoid duplicating the 0x prefix that + objdump_print_addr() will put on addresses when there + is no symbol table available. */ + if (info->symtab_size == 0) + 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; + opcode->name; + opcode++, maskptr++) { char * s; unsigned int bin = 0; unsigned int mask = 0; - + for (s = opcode->opcode; *s; ++s) { bin <<= 1; @@ -284,18 +344,25 @@ print_insn_avr(addr, info) } assert (s - opcode->opcode == 16); assert (opcode->bin_opcode == bin); - opcode->bin_mask = mask; + *maskptr = mask; } + + initialized = 1; } - insn = avrdis_opcode (addr, info); - - for (opcode = avr_opcodes; opcode->name; opcode++) + if (avrdis_opcode (addr, info, &insn) != 0) + return -1; + + for (opcode = avr_opcodes, maskptr = avr_bin_masks; + opcode->name; + opcode++, maskptr++) { - if ((insn & opcode->bin_mask) == 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). */ @@ -309,26 +376,28 @@ print_insn_avr(addr, info) if (opcode->name) { - char *op = opcode->constraints; + char *constraints = opcode->constraints; + char *opcode_str = opcode->opcode; insn2 = 0; ok = 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; } - if (*op && *op != '?') + if (*constraints && *constraints != '?') { - int regs = REGISTER_P (*op); + int regs = REGISTER_P (*constraints); - ok = avr_operand (insn, insn2, addr, *op, op1, comment1, 0); + ok = avr_operand (insn, insn2, addr, *constraints, opcode_str, op1, comment1, 0, &sym_op1, &sym_addr1); - if (ok && *(++op) == ',') - ok = avr_operand (insn, insn2, addr, *(++op), op2, - *comment1 ? comment2 : comment1, regs); + if (ok && *(++constraints) == ',') + ok = avr_operand (insn, insn2, addr, *(++constraints), opcode_str, op2, + *comment1 ? comment2 : comment1, regs, &sym_op2, &sym_addr2); } } @@ -344,7 +413,7 @@ print_insn_avr(addr, info) (*prin) (stream, "%s", ok ? opcode->name : ".word"); if (*op1) - (*prin) (stream, "\t%s", op1); + (*prin) (stream, "\t%s", op1); if (*op2) (*prin) (stream, ", %s", op2); @@ -352,8 +421,14 @@ print_insn_avr(addr, info) if (*comment1) (*prin) (stream, "\t; %s", comment1); + if (sym_op1) + info->print_address_func (sym_addr1, info); + if (*comment2) (*prin) (stream, " %s", comment2); + if (sym_op2) + info->print_address_func (sym_addr2, info); + return cmd_len; }