Bye bye PPC_OPCODE_ALTIVEC2

This bit is worse than useless.  Using it prevents the assembler and
disassembler distinguishing between opcodes added for power8 and those
added for power9.

include/
	* opcode/ppc.h (PPC_OPCODE_ALTIVEC2): Delete.
opcodes/
	* ppc-dis.c (ppc_opts): Remove PPC_OPCODE_ALTIVEC2.
	* ppc-opc.c (PPCVEC2): Define as PPC_OPCODE_POWER8|PPC_OPCODE_E6500.
	(PPCVEC3): Define as PPC_OPCODE_POWER9.

diff --git a/include/ChangeLog b/include/ChangeLog
index 330a6565a8d4a5bb9067779e44ad8c79a56fb82c..9e3223cca40777cebc785e0e30c8a1e15d136dbc 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-11  Alan Modra  <amodra@gmail.com>
+
+       * opcode/ppc.h (PPC_OPCODE_ALTIVEC2): Delete.
+
 2017-04-06  Pip Cet  <pipcet@gmail.com>
 
        * dis-asm.h: Add prototypes for wasm32 disassembler.

diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h
index c4de83401250cb2740db034ffb3e73def518afd3..c0112db295e5c6e6976e57ece5e2ac8ed29c96b2 100644 (file)
--- a/include/opcode/ppc.h
+++ b/include/opcode/ppc.h
@@ -179,9 +179,6 @@ extern const int vle_num_opcodes;
 /* Opcode which is supported by the e500 family */
 #define PPC_OPCODE_E500               0x100000000ull
 
-/* Opcode is supported by Extended Altivec Vector Unit */
-#define PPC_OPCODE_ALTIVEC2    0x200000000ull
-
 /* Opcode is supported by Power E6500 */
 #define PPC_OPCODE_E6500       0x400000000ull
 

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d2459d658e1475842adc8e80808204d91c4d8967..ef69ec44f474f37220d485f0b90191bda12def9a 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-11  Alan Modra  <amodra@gmail.com>
+
+       * ppc-dis.c (ppc_opts): Remove PPC_OPCODE_ALTIVEC2.
+       * ppc-opc.c (PPCVEC2): Define as PPC_OPCODE_POWER8|PPC_OPCODE_E6500.
+       (PPCVEC3): Define as PPC_OPCODE_POWER9.
+
 2017-04-10  Alan Modra  <amodra@gmail.com>
 
        * ppc-dis.c (ppc_opts <476>): Remove PPC_OPCODE_440.

diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index 82ce5355a512053eab08d9df202f1e4b5dcb6844..863b42902c403e3e69d94743227eeb1c3869a316 100644 (file)
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -147,7 +147,7 @@ struct ppc_mopt ppc_opts[] = {
   { "e6500",   (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL
                | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI
                | PPC_OPCODE_E500MC | PPC_OPCODE_64 | PPC_OPCODE_ALTIVEC
-               | PPC_OPCODE_ALTIVEC2 | PPC_OPCODE_E6500 | PPC_OPCODE_POWER4
+               | PPC_OPCODE_E6500 | PPC_OPCODE_POWER4
                | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7),
     0 },
   { "e500x2",  (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_SPE
@@ -172,12 +172,12 @@ struct ppc_mopt ppc_opts[] = {
   { "power8",  (PPC_OPCODE_PPC | PPC_OPCODE_ISEL | PPC_OPCODE_64
                | PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
                | PPC_OPCODE_POWER7 | PPC_OPCODE_POWER8 | PPC_OPCODE_HTM
-               | PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2 | PPC_OPCODE_VSX),
+               | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX),
     0 },
   { "power9",  (PPC_OPCODE_PPC | PPC_OPCODE_ISEL | PPC_OPCODE_64
                | PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
                | PPC_OPCODE_POWER7 | PPC_OPCODE_POWER8 | PPC_OPCODE_POWER9
-               | PPC_OPCODE_HTM | PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2
+               | PPC_OPCODE_HTM | PPC_OPCODE_ALTIVEC
                | PPC_OPCODE_VSX | PPC_OPCODE_VSX3 ),
     0 },
   { "ppc",     PPC_OPCODE_PPC,
@@ -216,12 +216,12 @@ struct ppc_mopt ppc_opts[] = {
   { "pwr8",    (PPC_OPCODE_PPC | PPC_OPCODE_ISEL | PPC_OPCODE_64
                | PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
                | PPC_OPCODE_POWER7 | PPC_OPCODE_POWER8 | PPC_OPCODE_HTM
-               | PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2 | PPC_OPCODE_VSX),
+               | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX),
     0 },
   { "pwr9",    (PPC_OPCODE_PPC | PPC_OPCODE_ISEL | PPC_OPCODE_64
                | PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
                | PPC_OPCODE_POWER7 | PPC_OPCODE_POWER8 | PPC_OPCODE_POWER9
-               | PPC_OPCODE_HTM | PPC_OPCODE_ALTIVEC | PPC_OPCODE_ALTIVEC2
+               | PPC_OPCODE_HTM | PPC_OPCODE_ALTIVEC
                | PPC_OPCODE_VSX | PPC_OPCODE_VSX3 ),
     0 },
   { "pwrx",    PPC_OPCODE_POWER | PPC_OPCODE_POWER2,

diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index 4e8b9bfc5c54511ae826ba9c510ddf43c5d3cd70..8c34ec1ae3416d8825a064176c60b0515709859c 100644 (file)
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -3089,8 +3089,8 @@ extract_vleil (unsigned long insn,
 #define PPC860 PPC_OPCODE_860
 #define PPCPS  PPC_OPCODE_PPCPS
 #define PPCVEC PPC_OPCODE_ALTIVEC
-#define PPCVEC2        PPC_OPCODE_ALTIVEC2
-#define PPCVEC3        PPC_OPCODE_ALTIVEC2
+#define PPCVEC2        (PPC_OPCODE_POWER8 | PPC_OPCODE_E6500)
+#define PPCVEC3        PPC_OPCODE_POWER9
 #define PPCVSX PPC_OPCODE_VSX
 #define PPCVSX2        PPC_OPCODE_VSX
 #define PPCVSX3        PPC_OPCODE_VSX3