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 b429f4ea00bd3a34233fa79fa83c47e07f9c7b56..730d6d267efb6cf4364f47a08c6bf77bce4604a5 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-22  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+       Apply from master
+       2015-12-02  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+       * gas/arm/armv8-a.d: <ldaexh>: Rename mismatched mnemonics ...
+       <ldah>: ... to this.
+
 2015-12-15  Matthew Wahab  <matthew.wahab@arm.com>
 
        * gas/aarch64/advsimd-fp16.d: Update expected output.

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 48d43007dd0a0b0d6ca9d5244d77da291c888601..2a41d858e5e4887944ca302f026146420f168810 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-22  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
+       Apply from master
+       2015-12-02  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+       * arm-dis.c (arm_opcodes): <ldaexh>: Fix typo...
+       <ldah>: ... to this.
+
 2015-12-15  Matthew Wahab  <matthew.wahab@arm.com>
 
        * aarch64-opc.c (aarch64_sys_reg_supported_p): Add mistakenly

diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 430da08863a6c0f48c1e938922cdb52ba74f08f8..ae49ebf58099d0aafb4793a2f49e5b511ae407c0 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -1607,7 +1607,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"},