|
 |
a094f6 |
commit 4bc0608a8b693f033555aa5705fdd5fc44cb9a9a
|
|
|
a094f6 |
Author: Peter Bergner <bergner@vnet.ibm.com>
|
|
|
a094f6 |
Date: Thu May 14 20:57:50 2015 -0500
|
|
|
a094f6 |
|
|
|
a094f6 |
Fix some PPC assembler errors.
|
|
|
a094f6 |
|
|
|
a094f6 |
Remove the wait instructions for server processors, since they were never
|
|
|
a094f6 |
implemented. Also add the extra operands added to the tlbie and slbia
|
|
|
a094f6 |
instructions with ISA 2.06 and ISA 2.05 respectively.
|
|
|
a094f6 |
|
|
|
a094f6 |
binutils/
|
|
|
a094f6 |
* MAINTAINERS: Add myself as PPC maintainer.
|
|
|
a094f6 |
|
|
|
a094f6 |
opcodes/
|
|
|
a094f6 |
* ppc-opc.c (IH) New define.
|
|
|
a094f6 |
(powerpc_opcodes) <wait>: Do not enable for POWER7.
|
|
|
a094f6 |
<tlbie>: Add RS operand for POWER7.
|
|
|
a094f6 |
<slbia>: Add IH operand for POWER6.
|
|
|
a094f6 |
|
|
|
a094f6 |
gas/testsuite/
|
|
|
a094f6 |
* gas/ppc/power4.d: Add a slbia test.
|
|
|
a094f6 |
* gas/ppc/power4.s: Likewise.
|
|
|
a094f6 |
* gas/ppc/power6.d: Add slbia and tlbie tests.
|
|
|
a094f6 |
* gas/ppc/power6.s: Likewise.
|
|
|
a094f6 |
* gas/ppc/power7.d: Remove wait tests. Add a tlbie test.
|
|
|
a094f6 |
* gas/ppc/power7.s: Likewise.
|
|
|
a094f6 |
|
|
|
a094f6 |
### a/opcodes/ChangeLog
|
|
|
a094f6 |
### b/opcodes/ChangeLog
|
|
|
a094f6 |
## -1,3 +1,10 @@
|
|
|
a094f6 |
+2015-05-14 Peter Bergner <bergner@vnet.ibm.com>
|
|
|
a094f6 |
+
|
|
|
a094f6 |
+ * ppc-opc.c (IH) New define.
|
|
|
a094f6 |
+ (powerpc_opcodes) <wait>: Do not enable for POWER7.
|
|
|
a094f6 |
+ <tlbie>: Add RS operand for POWER7.
|
|
|
a094f6 |
+ <slbia>: Add IH operand for POWER6.
|
|
|
a094f6 |
+
|
|
|
a094f6 |
2015-05-11 H.J. Lu <hongjiu.lu@intel.com>
|
|
|
a094f6 |
|
|
|
a094f6 |
* opcodes/i386-opc.tbl (call): Remove Disp16|Disp32 from 64-bit
|
|
|
a094f6 |
--- a/opcodes/ppc-opc.c
|
|
|
a094f6 |
+++ b/opcodes/ppc-opc.c
|
|
|
a094f6 |
@@ -866,6 +866,9 @@ const struct powerpc_operand powerpc_operands[] =
|
|
|
a094f6 |
|
|
|
a094f6 |
#define ERAT_T UIM + 1
|
|
|
a094f6 |
{ 0x7, 21, NULL, NULL, 0 },
|
|
|
a094f6 |
+
|
|
|
a094f6 |
+#define IH ERAT_T + 1
|
|
|
a094f6 |
+ { 0x7, 21, NULL, NULL, PPC_OPERAND_OPTIONAL },
|
|
|
a094f6 |
};
|
|
|
a094f6 |
|
|
|
a094f6 |
const unsigned int num_powerpc_operands = (sizeof (powerpc_operands)
|
|
|
a094f6 |
@@ -4486,7 +4489,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
|
|
|
a094f6 |
|
|
|
a094f6 |
{"waitrsv", X(31,62)|(1<<21), 0xffffffff, E500MC|PPCA2, PPCNONE, {0}},
|
|
|
a094f6 |
{"waitimpl", X(31,62)|(2<<21), 0xffffffff, E500MC|PPCA2, PPCNONE, {0}},
|
|
|
a094f6 |
-{"wait", X(31,62), XWC_MASK, POWER7|E500MC|PPCA2|PPCVLE, PPCNONE, {WC}},
|
|
|
a094f6 |
+{"wait", X(31,62), XWC_MASK, E500MC|PPCA2|PPCVLE, PPCNONE, {WC}},
|
|
|
a094f6 |
|
|
|
a094f6 |
{"dcbstep", XRT(31,63,0), XRT_MASK, E500MC|PPCA2|PPCVLE, PPCNONE, {RA0, RB}},
|
|
|
a094f6 |
|
|
|
a094f6 |
@@ -4780,7 +4783,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
|
|
|
a094f6 |
|
|
|
a094f6 |
{"mfbhrbe", X(31,302), X_MASK, POWER8, PPCNONE, {RT, BHRBE}},
|
|
|
a094f6 |
|
|
|
a094f6 |
-{"tlbie", X(31,306), XRTLRA_MASK, PPC, TITAN, {RB, L}},
|
|
|
a094f6 |
+{"tlbie", X(31,306), XRA_MASK, POWER7, TITAN, {RB, RS}},
|
|
|
a094f6 |
+{"tlbie", X(31,306), XRTLRA_MASK, PPC, POWER7|TITAN, {RB, L}},
|
|
|
a094f6 |
{"tlbi", X(31,306), XRT_MASK, POWER, PPCNONE, {RA0, RB}},
|
|
|
a094f6 |
|
|
|
a094f6 |
{"eciwx", X(31,310), X_MASK, PPC, TITAN, {RT, RA0, RB}},
|
|
|
a094f6 |
@@ -5372,7 +5376,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
|
|
|
a094f6 |
|
|
|
a094f6 |
{"icbtlse", X(31,494), X_MASK, PPCCHLK, E500MC, {CT, RA, RB}},
|
|
|
a094f6 |
|
|
|
a094f6 |
-{"slbia", X(31,498), 0xffffffff, PPC64, PPCNONE, {0}},
|
|
|
a094f6 |
+{"slbia", X(31,498), 0xff1fffff, POWER6, PPCNONE, {IH}},
|
|
|
a094f6 |
+{"slbia", X(31,498), 0xffffffff, PPC64, POWER6, {0}},
|
|
|
a094f6 |
|
|
|
a094f6 |
{"cli", X(31,502), XRB_MASK, POWER, PPCNONE, {RT, RA}},
|
|
|
a094f6 |
|