aarch64: Fix dgh disassembly

diff --git a/gas/testsuite/gas/aarch64/dgh.d b/gas/testsuite/gas/aarch64/dgh.d
index 9d11bec971253dd575a8009874806689d2972eee..e9eebbca202415770c9ce219471e55246f9609ff 100644 (file)
--- a/gas/testsuite/gas/aarch64/dgh.d
+++ b/gas/testsuite/gas/aarch64/dgh.d
@@ -7,5 +7,5 @@
 Disassembly of section \.text:
 
 0+ <\.text>:
- *[0-9a-f]*:   d50320df        hint    #0x6
- *[0-9a-f]*:   d50320df        hint    #0x6
+ *[0-9a-f]*:   d50320df        dgh
+ *[0-9a-f]*:   d50320df        dgh

diff --git a/gas/testsuite/gas/aarch64/system.d b/gas/testsuite/gas/aarch64/system.d
index 254b1ae8f1cef1eb12df1119fbda52495dd744cb..263581403b58fa809033aa72ec1bd7728c279e16 100644 (file)
--- a/gas/testsuite/gas/aarch64/system.d
+++ b/gas/testsuite/gas/aarch64/system.d
@@ -23,7 +23,7 @@ Disassembly of section \.text:
 .*:    d503207f        wfi
 .*:    d503209f        sev
 .*:    d50320bf        sevl
-.*:    d50320df        hint    #0x6
+.*:    d50320df        dgh
 .*:    d50320ff        (hint   #0x7|xpaclri)
 .*:    d503211f        (hint   #0x8|pacia1716)
 .*:    d503213f        hint    #0x9

diff --git a/opcodes/aarch64-asm-2.c b/opcodes/aarch64-asm-2.c
index 5b922055fc5e3841f14e57d0509d686b23131b80..5cb12cc53238bc004176421576138c858c8bd7a5 100644 (file)
--- a/opcodes/aarch64-asm-2.c
+++ b/opcodes/aarch64-asm-2.c
@@ -445,6 +445,7 @@ aarch64_find_real_opcode (const aarch64_opcode *opcode)
     case 1245: /* pacib1716 */
     case 1244: /* pacia1716 */
     case 1243: /* xpaclri */
+    case 1242: /* dgh */
     case 1241: /* sevl */
     case 1240: /* sev */
     case 1239: /* wfi */

diff --git a/opcodes/aarch64-dis-2.c b/opcodes/aarch64-dis-2.c
index e8768499592d3e12ac1a1ea914e8f07e93d81fb9..9de93e99c01875a6b0ab2aa037b85f709c7ea41d 100644 (file)
--- a/opcodes/aarch64-dis-2.c
+++ b/opcodes/aarch64-dis-2.c
@@ -34641,8 +34641,7 @@ aarch64_find_next_opcode (const aarch64_opcode *opcode)
     case 1230: value = 1231; break;    /* smstop --> chkfeat.  */
     case 1231: value = 1232; break;    /* chkfeat --> msr.  */
     case 1232: value = 1233; break;    /* msr --> hint.  */
-    case 1233: value = 1242; break;    /* hint --> dgh.  */
-    case 1242: value = 1252; break;    /* dgh --> clrex.  */
+    case 1233: value = 1252; break;    /* hint --> clrex.  */
     case 1252: value = 1253; break;    /* clrex --> dsb.  */
     case 1253: value = 1254; break;    /* dsb --> dsb.  */
     case 1254: value = 1258; break;    /* dsb --> dmb.  */
@@ -35152,7 +35151,8 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
     case 1246: value = 1245; break;    /* autia1716 --> pacib1716.  */
     case 1245: value = 1244; break;    /* pacib1716 --> pacia1716.  */
     case 1244: value = 1243; break;    /* pacia1716 --> xpaclri.  */
-    case 1243: value = 1241; break;    /* xpaclri --> sevl.  */
+    case 1243: value = 1242; break;    /* xpaclri --> dgh.  */
+    case 1242: value = 1241; break;    /* dgh --> sevl.  */
     case 1241: value = 1240; break;    /* sevl --> sev.  */
     case 1240: value = 1239; break;    /* sev --> wfi.  */
     case 1239: value = 1238; break;    /* wfi --> wfe.  */

diff --git a/opcodes/aarch64-tbl.h b/opcodes/aarch64-tbl.h
index f735899028926e25f7d068a95151f41f2481014a..28230aa08f29e789194439ebcd133d17c942f6c7 100644 (file)
--- a/opcodes/aarch64-tbl.h
+++ b/opcodes/aarch64-tbl.h
@@ -4598,7 +4598,7 @@ const struct aarch64_opcode aarch64_opcode_table[] =
   CORE_INSN ("wfi", 0xd503207f, 0xffffffff, ic_system, 0, OP0 (), {}, F_ALIAS),
   CORE_INSN ("sev", 0xd503209f, 0xffffffff, ic_system, 0, OP0 (), {}, F_ALIAS),
   CORE_INSN ("sevl",0xd50320bf, 0xffffffff, ic_system, 0, OP0 (), {}, F_ALIAS),
-  CORE_INSN ("dgh", 0xd50320df, 0xffffffff, ic_system, 0, OP0 (), {}, 0),
+  CORE_INSN ("dgh", 0xd50320df, 0xffffffff, ic_system, 0, OP0 (), {}, F_ALIAS),
   CORE_INSN ("xpaclri", 0xd50320ff, 0xffffffff, ic_system, 0, OP0 (), {}, F_ALIAS),
   CORE_INSN ("pacia1716", 0xd503211f, 0xffffffff, ic_system, 0, OP0 (), {}, F_ALIAS),
   CORE_INSN ("pacib1716", 0xd503215f, 0xffffffff, ic_system, 0, OP0 (), {}, F_ALIAS),