Remove ppc860, ppc750cl, ppc7450 insns from common ppc.

Back in the day support for these processors was added, we probably
didn't want to waste PPC_OPCODE bits on minor variations.  I've had a
complaint that disassembly of mfspr/mtspr was wrong for power8.  This
patch fixes that problem.

Note that since -m860/-m850/-m821 are new gas options enabling the
mpc8xx specific mfspr/mtspr variants it is possible that this change
will break some mpc8xx assembly code.  ie. you might need to modify
makefiles to pass -m860 to gas.

include/opcode/
	* ppc.h (PPC_OPCODE_750, PPC_OPCODE_7450, PPC_OPCODE_860): Define.
opcodes/
	* ppc-opc.c (PPC750, PPC7450, PPC860): Define using PPC_OPCODE_*.
	* ppc-dis.c (ppc_opts): Add 821, 850 and 860 entries.  Add
	PPC_OPCODE_7450 to 7450 entry.  Add PPC_OPCODE_750 to 750cl entry.
gas/
	* config/tc-ppc.c (md_show_usage): Add -m821, -m850, -m860.
	* doc/c-ppc.texi (PowerPC-Opts): Likewise.
gas/testsuite/
	* gas/ppc/titan.d: Correct mfmcsrr0 disassembly.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6ca50670458c892a80cf7483b54aa07506ef0a10..0b165dc00f0bd6be74d6ae740f2c767fd32b6730 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,6 +1,10 @@
 2015-07-10  Alan Modra  <amodra@gmail.com>
 
        Apply from master
+       2015-07-03  Alan Modra  <amodra@gmail.com>
+       * config/tc-ppc.c (md_show_usage): Add -m821, -m850, -m860.
+       * doc/c-ppc.texi (PowerPC-Opts): Likewise.
+
        2015-06-19  Peter Bergner  <bergner@vnet.ibm.com>
        * config/tc-ppc.c (md_assemble): Use ppc_optional_operand_value.
        Allow for optional operands without insert functions.

diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 00e20f9c83f68ecc7671c1767ce7cb1a1c96933c..1b1a33cb30cea33b3578b90ec4c421dfaf5e22b8 100644 (file)
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -1281,7 +1281,8 @@ PowerPC options:\n\
 -m476                   generate code for PowerPC 476\n\
 -m7400, -m7410, -m7450, -m7455\n\
                         generate code for PowerPC 7400/7410/7450/7455\n\
--m750cl                 generate code for PowerPC 750cl\n"));
+-m750cl                 generate code for PowerPC 750cl\n\
+-m821, -m850, -m860     generate code for PowerPC 821/850/860\n"));
   fprintf (stream, _("\
 -mppc64, -m620          generate code for PowerPC 620/625/630\n\
 -mppc64bridge           generate code for PowerPC 64, including bridge insns\n\

diff --git a/gas/doc/c-ppc.texi b/gas/doc/c-ppc.texi
index c457a5070fc541c55d1668e6a925da2e5a399123..d5f5b76a066e36ae3aae151a1491094dccdedf99 100644 (file)
--- a/gas/doc/c-ppc.texi
+++ b/gas/doc/c-ppc.texi
@@ -75,6 +75,9 @@ Generate code for PowerPC 7400/7410/7450/7455.
 @item -m750cl
 Generate code for PowerPC 750CL.
 
+@item -m821, -m850, -m860
+Generate code for PowerPC 821/850/860.
+
 @item -mppc64, -m620
 Generate code for PowerPC 620/625/630.
 

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c6d27eb774b0e45626ac1bcc4cf9e2d0f7cf68ae..4d7e338854594f2ff570a2ebed4f8a3def8e2030 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,6 +1,9 @@
 2015-07-10  Alan Modra  <amodra@gmail.com>
 
        Apply from master
+       2015-07-03  Alan Modra  <amodra@gmail.com>
+       * gas/ppc/titan.d: Correct mfmcsrr0 disassembly.
+
        2015-06-22  Peter Bergner  <bergner@vnet.ibm.com>
        * gas/ppc/e6500.s <sync>: Fix invalid test.
        * gas/ppc/e6500.d: Likewise.

diff --git a/gas/testsuite/gas/ppc/titan.d b/gas/testsuite/gas/ppc/titan.d
index 45c41bb7f39e4caa0a9ad6974ff79e32438d38e5..e54715a7488e676261720ac928fc3ee8e7feefa7 100644 (file)
--- a/gas/testsuite/gas/ppc/titan.d
+++ b/gas/testsuite/gas/ppc/titan.d
@@ -229,8 +229,8 @@ Disassembly of section \.text:
  36c:  (7c 9f 62 a6|a6 62 9f 7c)       mfivor15 r4
  370:  (7c 93 82 a6|a6 82 93 7c)       mfivor35 r4
  374:  (7c 93 82 a6|a6 82 93 7c)       mfivor35 r4
- 378:  (7c 9a 8a a6|a6 8a 9a 7c)       mfdc_dat r4
- 37c:  (7c 9a 8a a6|a6 8a 9a 7c)       mfdc_dat r4
+ 378:  (7c 9a 8a a6|a6 8a 9a 7c)       mfmcsrr0 r4
+ 37c:  (7c 9a 8a a6|a6 8a 9a 7c)       mfmcsrr0 r4
  380:  (7c 9b 8a a6|a6 8a 9b 7c)       mfmcsrr1 r4
  384:  (7c 9b 8a a6|a6 8a 9b 7c)       mfmcsrr1 r4
  388:  (7c 9c 8a a6|a6 8a 9c 7c)       mfmcsr  r4

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index e3132d8dd5265dc7231e3041bea0992ead98f177..71ddd5b8e56f3709f67894c95114e05df011404a 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,6 +1,9 @@
 2015-07-10  Alan Modra  <amodra@gmail.com>
 
        Apply from master
+       2015-07-03  Alan Modra  <amodra@gmail.com>
+       * ppc.h (PPC_OPCODE_750, PPC_OPCODE_7450, PPC_OPCODE_860): Define.
+
        2015-06-19  Peter Bergner <bergner@vnet.ibm.com>
        * ppc.h (PPC_OPERAND_OPTIONAL_VALUE): New.
        (ppc_optional_operand_value): New inline function.

diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h
index 5add00fe7fafb8a89389b0b29aa8ac2c14cccfe8..5839c74a8b8d1ffa43ede519d8c1ce38e466c370 100644 (file)
--- a/include/opcode/ppc.h
+++ b/include/opcode/ppc.h
@@ -195,6 +195,15 @@ extern const int vle_num_opcodes;
    that isn't a superset of POWER8, we can define this to its own mask.  */
 #define PPC_OPCODE_HTM        PPC_OPCODE_POWER8
 
+/* Opcode is supported by ppc750cl.  */
+#define PPC_OPCODE_750       0x4000000000ull
+
+/* Opcode is supported by ppc7450.  */
+#define PPC_OPCODE_7450              0x8000000000ull
+
+/* Opcode is supported by ppc821/850/860.  */
+#define PPC_OPCODE_860       0x10000000000ull
+
 /* A macro to extract the major opcode from an instruction.  */
 #define PPC_OP(i) (((i) >> 26) & 0x3f)
 

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d3a168f8b9aa258f8886bc09a369bef8efe5829c..54d4b6ba50fb25df41f65f514a89d96a375be7e0 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,6 +1,11 @@
 2015-07-10  Alan Modra  <amodra@gmail.com>
 
        Apply from master
+       2015-07-03  Alan Modra  <amodra@gmail.com>
+       * ppc-opc.c (PPC750, PPC7450, PPC860): Define using PPC_OPCODE_*.
+       * ppc-dis.c (ppc_opts): Add 821, 850 and 860 entries.  Add
+       PPC_OPCODE_7450 to 7450 entry.  Add PPC_OPCODE_750 to 750cl entry.
+
        2015-06-22  Peter Bergner  <bergner@vnet.ibm.com>
        * ppc-opc.c (insert_ls): Test for invalid LS operands.
        (insert_esync): New function.

diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index 2e1075c942d50eb7efa8f9e7565eb10009e15423..00a2d15fdc3675a06956d058c8f4258ad155d4cf 100644 (file)
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -76,12 +76,18 @@ struct ppc_mopt ppc_opts[] = {
     0 },
   { "7410",    (PPC_OPCODE_PPC | PPC_OPCODE_ALTIVEC),
     0 },
-  { "7450",    (PPC_OPCODE_PPC | PPC_OPCODE_ALTIVEC),
+  { "7450",    (PPC_OPCODE_PPC | PPC_OPCODE_7450 | PPC_OPCODE_ALTIVEC),
     0 },
   { "7455",    (PPC_OPCODE_PPC | PPC_OPCODE_ALTIVEC),
     0 },
-  { "750cl",   (PPC_OPCODE_PPC | PPC_OPCODE_PPCPS)
+  { "750cl",   (PPC_OPCODE_PPC | PPC_OPCODE_750 | PPC_OPCODE_PPCPS)
     , 0 },
+  { "821",     (PPC_OPCODE_PPC | PPC_OPCODE_860),
+    0 },
+  { "850",     (PPC_OPCODE_PPC | PPC_OPCODE_860),
+    0 },
+  { "860",     (PPC_OPCODE_PPC | PPC_OPCODE_860),
+    0 },
   { "a2",      (PPC_OPCODE_PPC | PPC_OPCODE_ISEL | PPC_OPCODE_POWER4
                | PPC_OPCODE_POWER5 | PPC_OPCODE_CACHELCK | PPC_OPCODE_64
                | PPC_OPCODE_A2),

diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index a6e2c14758838827d5e79f041636784330b90135..a7e93b1136b0152e3960303680c5834fa0af9c1f 100644 (file)
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -2747,9 +2747,9 @@ extract_vleil (unsigned long insn,
 #define PPC440 PPC_OPCODE_440
 #define PPC464 PPC440
 #define PPC476 PPC_OPCODE_476
-#define PPC750 PPC
-#define PPC7450 PPC
-#define PPC860 PPC
+#define PPC750 PPC_OPCODE_750
+#define PPC7450 PPC_OPCODE_7450
+#define PPC860 PPC_OPCODE_860
 #define PPCPS  PPC_OPCODE_PPCPS
 #define PPCVEC PPC_OPCODE_ALTIVEC
 #define PPCVEC2        PPC_OPCODE_ALTIVEC2