Fix ldah being disassembled as ldaexh

2015-12-02  Andre Vieira  <andre.simoesdiasvieira@arm.com>

opcodes/
    * arm-dis.c (arm_opcodes): <ldaexh>: Fix typo...
    <ldah>: ... to this.

gas/testsuite/
    * gas/arm/armv8-a.d: <ldaexh>: Rename mismatched mnemonics ...
    <ldah>: ... to this.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 0f5c65f233f2da638ce4d5c9b276b1e0c7486d48..7fd7a63364c9bc0ea6301b8f11c03dc2a47c15d5 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-02  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+       * gas/arm/armv8-a.d: <ldaexh>: Rename mismatched mnemonics ...
+       <ldah>: ... to this.
+
 2015-12-11  Matthew Wahab  <matthew.wahab@arm.com>
 
        * gas/aarch64/system-2.d: Enable the statistical profiling

diff --git a/gas/testsuite/gas/arm/armv8-a.d b/gas/testsuite/gas/arm/armv8-a.d
index 60e5067524065085efc1e18d68eb7cbb9f257533..2119bcbd21bfb203dfb0a535f7a2e47d5530208a 100644 (file)
--- a/gas/testsuite/gas/arm/armv8-a.d
+++ b/gas/testsuite/gas/arm/armv8-a.d
@@ -32,9 +32,9 @@ Disassembly of section .text:
 0[0-9a-f]+ <[^>]+> e1d00c9f    ldab    r0, \[r0\]
 0[0-9a-f]+ <[^>]+> e1d11c9f    ldab    r1, \[r1\]
 0[0-9a-f]+ <[^>]+> e1deec9f    ldab    lr, \[lr\]
-0[0-9a-f]+ <[^>]+> e1f00c9f    ldaexh  r0, \[r0\]
-0[0-9a-f]+ <[^>]+> e1f11c9f    ldaexh  r1, \[r1\]
-0[0-9a-f]+ <[^>]+> e1feec9f    ldaexh  lr, \[lr\]
+0[0-9a-f]+ <[^>]+> e1f00c9f    ldah    r0, \[r0\]
+0[0-9a-f]+ <[^>]+> e1f11c9f    ldah    r1, \[r1\]
+0[0-9a-f]+ <[^>]+> e1feec9f    ldah    lr, \[lr\]
 0[0-9a-f]+ <[^>]+> e1900c9f    lda     r0, \[r0\]
 0[0-9a-f]+ <[^>]+> e1911c9f    lda     r1, \[r1\]
 0[0-9a-f]+ <[^>]+> e19eec9f    lda     lr, \[lr\]

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index c74fa34edcbdb23f47b52eb0e921cfd1e145cb31..622ff5d6bef5851f5f6cb7cd0227274f32e562d4 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-02  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+       * arm-dis.c (arm_opcodes): <ldaexh>: Fix typo...
+       <ldah>: ... to this.
+
 2015-06-16  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
        * arm-dis.c (print_insn_coprocessor): Avoid negative shift.

diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 7171f12278b71decdcbc8ec6734af50924988a0e..641f886d543a59a5e592b4848dbaffdc5fccdee7 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -1606,7 +1606,7 @@ static const struct opcode32 arm_opcodes[] =
   {ARM_FEATURE_CORE_LOW (ARM_EXT_V8),
     0x01e0fc90, 0x0ff0fff0, "stlh%c\t%0-3r, [%16-19R]"},
   {ARM_FEATURE_CORE_LOW (ARM_EXT_V8),
-    0x01f00c9f, 0x0ff00fff, "ldaexh%c\t%12-15r, [%16-19R]"},
+    0x01f00c9f, 0x0ff00fff, "ldah%c\t%12-15r, [%16-19R]"},
   /* CRC32 instructions.  */
   {ARM_FEATURE_COPROC (CRC_EXT_ARMV8),
     0xe1000040, 0xfff00ff0, "crc32b\t%12-15R, %16-19R, %0-3R"},