aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2019-10-09 13:48:06 +0100
committerNick Clifton <nickc@redhat.com>2019-10-09 13:48:06 +0100
commit1d3787499d6edd07b30f3fc7b26962a1c695b8a4 (patch)
tree1d09c665560e756e49860f513820650db3095226 /opcodes
parentPR25081, Discrepancy between VMA and LMA after ALIGN (diff)
downloadbinutils-gdb-1d3787499d6edd07b30f3fc7b26962a1c695b8a4.tar.gz
binutils-gdb-1d3787499d6edd07b30f3fc7b26962a1c695b8a4.tar.bz2
binutils-gdb-1d3787499d6edd07b30f3fc7b26962a1c695b8a4.zip
Fix the disassembly of the LDS and STS instructions of the AVR architecture.
PR 25041 opcodes * avr-dis.c (avr_operand): Fix construction of address for lds/sts instructions. gas * testsuite/gas/avr/pr25041.s: New test. * testsuite/gas/avr/pr25041.d: New test driver.
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog6
-rw-r--r--opcodes/avr-dis.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 75167a0c68f..acde7a25313 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-09 Nick Clifton <nickc@redhat.com>
+
+ PR 25041
+ * avr-dis.c (avr_operand): Fix construction of address for lds/sts
+ instructions.
+
2019-10-07 Jan Beulich <jbeulich@suse.com>
* opcodes/i386-opc.tbl (movsd): Add Dword and IgnoreSize.
diff --git a/opcodes/avr-dis.c b/opcodes/avr-dis.c
index b847ee993c6..ab38366f64e 100644
--- a/opcodes/avr-dis.c
+++ b/opcodes/avr-dis.c
@@ -198,6 +198,8 @@ avr_operand (unsigned int insn, unsigned int insn2, unsigned int pc, int constra
{
unsigned int val = ((insn & 0xf) | ((insn & 0x600) >> 5)
| ((insn & 0x100) >> 2));
+ if ((insn & 0x100) == 0)
+ val |= 0x80;
*sym = 1;
*sym_addr = val | 0x800000;
sprintf (buf, "0x%02x", val);