From 1437d0631b209500db8371c425e896deb66ec9f9 Mon Sep 17 00:00:00 2001 From: Peter Bergner Date: Wed, 8 Mar 2017 14:00:42 -0600 Subject: [PATCH] Add support for the new 'lnia' extended mnemonic. opcodes/ * ppc-opc.c (powerpc_opcodes) : New extended mnemonic. gas/ * testsuite/gas/ppc/power9.d New test. * testsuite/gas/ppc/power9.s: Likewise. --- gas/ChangeLog | 5 +++++ gas/testsuite/gas/ppc/power9.d | 5 +++-- gas/testsuite/gas/ppc/power9.s | 1 + opcodes/ChangeLog | 4 ++++ opcodes/ppc-opc.c | 3 +++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 7949343d460..f5a4bf7d0f1 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2017-03-08 Peter Bergner + + * testsuite/gas/ppc/power9.d New test. + * testsuite/gas/ppc/power9.s: Likewise. + 2017-03-07 Alan Modra * doc/as.texinfo (2byte, 4byte, 8byte): Correct @section placement. diff --git a/gas/testsuite/gas/ppc/power9.d b/gas/testsuite/gas/ppc/power9.d index 9ba53d0679d..a67898ff3aa 100644 --- a/gas/testsuite/gas/ppc/power9.d +++ b/gas/testsuite/gas/ppc/power9.d @@ -312,8 +312,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 27f1122018a..4e3530fba9e 100644 --- a/gas/testsuite/gas/ppc/power9.s +++ b/gas/testsuite/gas/ppc/power9.s @@ -303,6 +303,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 f2b1becc364..3a4df13adb6 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2017-03-08 Peter Bergner + + * ppc-opc.c (powerpc_opcodes) : New extended mnemonic. + 2017-03-06 H.J. Lu * i386-dis.c (REG_0F1E_MOD_3): New enum. diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c index bbff9b36d80..35804539fae 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -2552,6 +2552,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) @@ -4264,6 +4266,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { {"mcrf", XL(19,0), XLBB_MASK|(3<<21)|(3<<16), COM, PPCVLE, {BF, BFA}}, +{"lnia", DX(19,2), NODX_MASK, POWER9, PPCVLE, {RT}}, {"addpcis", DX(19,2), DX_MASK, POWER9, PPCVLE, {RT, DXD}}, {"subpcis", DX(19,2), DX_MASK, POWER9, PPCVLE, {RT, NDXD}}, -- 2.30.2