Add support for the new 'lnia' extended mnemonic.

opcodes/
	Apply from master.
	2017-03-08  Peter Bergner  <bergner@vnet.ibm.com>
	* ppc-opc.c (powerpc_opcodes) <lnia>: New extended mnemonic.

gas/
	Apply from master.
	2017-03-08  Peter Bergner  <bergner@vnet.ibm.com>
	* testsuite/gas/ppc/power9.d <lnia> New test.
	* testsuite/gas/ppc/power9.s: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5761c773a55d5009f202d3c4c2b6e06a04bdfb5b..2404fe1cad024d5116789d95b1b0cddbd82f9502 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2017-03-08  Peter Bergner  <bergner@vnet.ibm.com>
+
+       Apply from master.
+       2017-03-08  Peter Bergner  <bergner@vnet.ibm.com>
+       * testsuite/gas/ppc/power9.d <lnia> New test.
+       * testsuite/gas/ppc/power9.s: Likewise.
+
 2017-02-28  Peter Bergner <bergner@vnet.ibm.com>
 
        Apply from master.

diff --git a/gas/testsuite/gas/ppc/power9.d b/gas/testsuite/gas/ppc/power9.d
index 8e2f2518f8c6433699361dec4b129cd4c573cc12..27ac0349a0bfc2e358a709d990636163e32dc489 100644 (file)
--- a/gas/testsuite/gas/ppc/power9.d
+++ b/gas/testsuite/gas/ppc/power9.d
@@ -310,8 +310,9 @@ Disassembly of section \.text:
 .*:    (f1 31 9d 6f|6f 9d 31 f1)       xscvdphp vs41,vs51
 .*:    (f1 58 a7 6f|6f a7 58 f1)       xvcvhpsp vs42,vs52
 .*:    (f1 79 af 6f|6f af 79 f1)       xvcvsphp vs43,vs53
-.*:    (4c 60 00 04|04 00 60 4c)       addpcis r3,0
-.*:    (4c 60 00 04|04 00 60 4c)       addpcis r3,0
+.*:    (4c 60 00 04|04 00 60 4c)       lnia    r3
+.*:    (4c 60 00 04|04 00 60 4c)       lnia    r3
+.*:    (4c 60 00 04|04 00 60 4c)       lnia    r3
 .*:    (4c 80 00 05|05 00 80 4c)       addpcis r4,1
 .*:    (4c 80 00 05|05 00 80 4c)       addpcis r4,1
 .*:    (4c bf ff c4|c4 ff bf 4c)       addpcis r5,-2

diff --git a/gas/testsuite/gas/ppc/power9.s b/gas/testsuite/gas/ppc/power9.s
index 45f7b5b6d47f927ddf892a4e77045c947df5e842..31611ee8fefb57c3df95bd9236cde14e44426b48 100644 (file)
--- a/gas/testsuite/gas/ppc/power9.s
+++ b/gas/testsuite/gas/ppc/power9.s
@@ -301,6 +301,7 @@ power9:
        xscvdphp    41,51
        xvcvhpsp    42,52
        xvcvsphp    43,53
+       lnia        3
        addpcis     3,0
        subpcis     3,0
        addpcis     4,1

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 1a22b34f918550d7370edd66245b16598c9076d7..8b5ef7a580aa64f2873fc5f54bdff4297ffc0433 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-08  Peter Bergner  <bergner@vnet.ibm.com>
+
+       Apply from master.
+       2017-03-08  Peter Bergner  <bergner@vnet.ibm.com>
+       * ppc-opc.c (powerpc_opcodes) <lnia>: New extended mnemonic.
+
 2017-02-28  Peter Bergner <bergner@vnet.ibm.com>
 
        Apply from master.

diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index 8190195f1f1da5f4c0734ed902124cb63c6b27dd..604c856041b5cadf1f8e0c9ea9c0e6bf14d16753 100644 (file)
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -2479,6 +2479,8 @@ extract_vleil (unsigned long insn,
 /* An DX form instruction.  */
 #define DX(op, xop) (OP (op) | ((((unsigned long)(xop)) & 0x1f) << 1))
 #define DX_MASK DX (0x3f, 0x1f)
+/* An DX form instruction with the D bits specified.  */
+#define NODX_MASK (DX_MASK | 0x1fffc1)
 
 /* An EVSEL form instruction.  */
 #define EVSEL(op, xop) (OP (op) | (((unsigned long)(xop)) & 0xff) << 3)
@@ -4191,6 +4193,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 {"mcrf",      XL(19,0), XLBB_MASK|(3<<21)|(3<<16), COM,        PPCNONE,        {BF, BFA}},
 
+{"lnia",      DX(19,2),                NODX_MASK,   POWER9,    PPCNONE,        {RT}},
 {"addpcis",   DX(19,2),                DX_MASK,     POWER9,    PPCNONE,        {RT, DXD}},
 {"subpcis",   DX(19,2),                DX_MASK,     POWER9,    PPCNONE,        {RT, NDXD}},