[gas/testsuite/ChangeLog]

	* gas/ppc/booke.s (rfci, wrtee, wrteei, mfdcrx, mfdcr, mtdcrx,
	mtdcr, msync, dcba, mbar): New BookE tests.
	* gas/ppc/booke.d: Update for new BookE tests.

[opcodes/ChangeLog]
	* ppc-opc.c (MO): New macro for MO field of mbar instruction.
	(powerpc_opcodes): Add rfci, wrtee, wrteei, mfdcrx, mfdcr,
	mtdcrx, mtdcr, msync, dcba and mbar as BookE instructions.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 06698ef..06a2e86 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-13  matthew green  <mrg@redhat.com>
+
+       * gas/ppc/booke.s (rfci, wrtee, wrteei, mfdcrx, mfdcr, mtdcrx,
+       mtdcr, msync, dcba, mbar): New BookE tests.
+       * gas/ppc/booke.d: Update for new BookE tests.
+
 2001-10-12  matthew green  <mrg@redhat.com>
 
        * gas/ppc/booke.s: New test for Motorola BookE.

diff --git a/gas/testsuite/gas/ppc/booke.d b/gas/testsuite/gas/ppc/booke.d
index 0e5b400..37b8ebe 100644 (file)
--- a/gas/testsuite/gas/ppc/booke.d
+++ b/gas/testsuite/gas/ppc/booke.d
@@ -127,4 +127,14 @@ Disassembly of section \.text:
  184:  e8 62 02 8f     stwue   r3,40\(r2\)
  188:  7c 22 19 7e     stwuxe  r1,r2,r3
  18c:  7c 85 31 3e     stwxe   r4,r5,r6
+ 190:  4c 00 00 66     rfci
+ 194:  7c 60 01 06     wrtee   r3
+ 198:  7c 00 81 46     wrteei  1
+ 19c:  7c 85 02 06     mfdcrx  r4,r5
+ 1a0:  7c aa 3a 86     mfdcr   r5,234
+ 1a4:  7c e6 03 06     mtdcrx  r6,r7
+ 1a8:  7d 10 6b 86     mtdcr   432,r8
+ 1ac:  7c 00 04 ac     sync    
+ 1b0:  7c 09 55 ec     dcba    r9,r10
+ 1b4:  7c 00 06 ac     eieio
 Disassembly of section \.data:

diff --git a/gas/testsuite/gas/ppc/booke.s b/gas/testsuite/gas/ppc/booke.s
index 5929a36..f0bbecc 100644 (file)
--- a/gas/testsuite/gas/ppc/booke.s
+++ b/gas/testsuite/gas/ppc/booke.s
@@ -118,3 +118,14 @@ branch_target_8:
        stwue   3, 40(2)
        stwuxe  1, 2, 3
        stwxe   4, 5, 6
+
+       rfci
+       wrtee   3
+       wrteei  1
+       mfdcrx  4, 5
+       mfdcr   5, 234
+       mtdcrx  6, 7
+       mtdcr   432, 8
+       msync
+       dcba    9, 10
+       mbar    0

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 6e97947..fc9f4ba 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-13  matthew green  <mrg@redhat.com>
+
+       * ppc-opc.c (MO): New macro for MO field of mbar instruction.
+       (powerpc_opcodes): Add rfci, wrtee, wrteei, mfdcrx, mfdcr,
+       mtdcrx, mtdcr, msync, dcba and mbar as BookE instructions.
+
 2001-10-13  Nick Clifton  <nickc@cambridge.redhat.com>
 
        * cgen-ibld.in: Include safe-ctype.h in preference to

diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index 14d1d5b..4ff73cd 100644 (file)
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -308,9 +308,13 @@ const struct powerpc_operand powerpc_operands[] =
 #define MB6_MASK (0x3f << 5)
   { 6, 5, insert_mb6, extract_mb6, 0 },
 
+  /* The MO field in an mbar instruction.  */
+#define MO MB6 + 1
+  { 5, 21, 0, 0, 0 },
+
   /* The NB field in an X form instruction.  The value 32 is stored as
      0.  */
-#define NB MB6 + 1
+#define NB MO + 1
   { 6, 11, insert_nb, extract_nb, 0 },
 
   /* The NSI field in a D form instruction.  This is the same as the
@@ -2225,6 +2229,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "rfi",     XL(19,50),        0xffffffff,     COM,            { 0 } },
 { "rfci",    XL(19,51),        0xffffffff,     PPC403,         { 0 } },
+{ "rfci",    XL(19,51),        0xffffffff,     BOOKE,          { 0 } },
 
 { "rfsvc",   XL(19,82),        0xffffffff,     POWER,          { 0 } },
 
@@ -2610,6 +2615,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "lbzuxe",  X(31,127),        X_MASK,         BOOKE64,        { RT, RAL, RB } },
 
 { "wrtee",   X(31,131),        XRARB_MASK,     PPC403,         { RS } },
+{ "wrtee",   X(31,131),        XRARB_MASK,     BOOKE,          { RS } },
 
 { "subfe",   XO(31,136,0,0), XO_MASK,  PPCCOM,         { RT, RA, RB } },
 { "sfe",     XO(31,136,0,0), XO_MASK,  PWRCOM,         { RT, RA, RB } },
@@ -2652,6 +2658,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "sle.",    XRC(31,153,1), X_MASK,    M601,           { RA, RS, RB } },
 
 { "wrteei",  X(31,163),        XE_MASK,        PPC403,         { E } },
+{ "wrteei",  X(31,163),        XE_MASK,        BOOKE,          { E } },
 
 { "mtmsrd",  X(31,178),        XRARB_MASK,     PPC64,          { RS } },
 
@@ -2743,6 +2750,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "stbuxe",  X(31,255),        X_MASK,         BOOKE64,        { RS, RAS, RB } },
 
+{ "mfdcrx",  X(31,259),        X_MASK,         BOOKE,          { RS, RA } },
+
 { "icbt",    X(31,262),        XRT_MASK,       PPC403,         { RA, RB } },
 
 { "doz",     XO(31,264,0,0), XO_MASK,  M601,           { RT, RA, RB } },
@@ -2822,6 +2831,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mfdmacc3", XSPR(31,323,220), XSPR_MASK, PPC403,     { RT } },
 { "mfdmasr", XSPR(31,323,224), XSPR_MASK, PPC403,      { RT } },
 { "mfdcr",   X(31,323),        X_MASK,         PPC403,         { RT, SPR } },
+{ "mfdcr",   X(31,323),        X_MASK,         BOOKE,          { RT, SPR } },
 
 { "div",     XO(31,331,0,0), XO_MASK,  M601,           { RT, RA, RB } },
 { "div.",    XO(31,331,0,1), XO_MASK,  M601,           { RT, RA, RB } },
@@ -2990,6 +3000,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 
 { "lhauxe",  X(31,383),        X_MASK,         BOOKE64,        { RT, RAL, RB } },
 
+{ "mtdcrx",  X(31,387),        X_MASK,         BOOKE,          { RA, RS } },
+
 { "subfe64", XO(31,392,0,0), XO_MASK,  BOOKE64,        { RT, RA, RB } },
 { "subfe64o",XO(31,392,1,0), XO_MASK,  BOOKE64,        { RT, RA, RB } },
 
@@ -3064,6 +3076,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "mtdmacc3", XSPR(31,451,220), XSPR_MASK, PPC403,     { RT } },
 { "mtdmasr", XSPR(31,451,224), XSPR_MASK, PPC403,      { RT } },
 { "mtdcr",   X(31,451),        X_MASK,         PPC403,         { SPR, RS } },
+{ "mtdcr",   X(31,451),        X_MASK,         BOOKE,          { SPR, RS } },
 
 { "subfze64",XO(31,456,0,0), XORB_MASK, BOOKE64,       { RT, RA } },
 { "subfze64o",XO(31,456,1,0), XORB_MASK, BOOKE64,      { RT, RA } },
@@ -3267,6 +3280,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "ptesync", XSYNC(31,598,2), 0xffffffff, PPC64,       { 0 } },
 { "sync",    X(31,598), XSYNC_MASK,    PPCCOM,         { LS } },
 { "dcs",     X(31,598), 0xffffffff,    PWRCOM,         { 0 } },
+{ "msync",   X(31,598), 0xf80007fe,    BOOKE,          { 0 } },
 
 { "lfdx",    X(31,599), X_MASK,                COM,            { FRT, RA, RB } },
 
@@ -3321,6 +3335,7 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "stfdxe",  X(31,735),        X_MASK,         BOOKE64,        { FRS, RA, RB } },
 
 { "dcba",    X(31,758),        XRT_MASK,       PPC405,         { RA, RB } },
+{ "dcba",    X(31,758),        XRT_MASK,       BOOKE,          { RA, RB } },
 
 { "stfdux",  X(31,759),        X_MASK,         COM,            { FRS, RAS, RB } },
 
@@ -3359,12 +3374,13 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "slbmfev", X(31,851), XRA_MASK,      PPC64,          { RT, RB } },
 
 { "eieio",   X(31,854),        0xffffffff,     PPC,            { 0 } },
+{ "mbar",    X(31,854),        0xffffffff,     BOOKE,          { MO } },
 
-{ "tlbsx",   XRC(31,914,0), X_MASK, PPC403,    { RT, RA, RB } },
-{ "tlbsx.",  XRC(31,914,1), X_MASK, PPC403,    { RT, RA, RB } },
+{ "tlbsx",   XRC(31,914,0), X_MASK,    PPC403,         { RT, RA, RB } },
+{ "tlbsx.",  XRC(31,914,1), X_MASK,    PPC403,         { RT, RA, RB } },
 
-{ "tlbsx",   XRC(31,914,0), X_MASK,     BOOKE, { RA, RB } },
-{ "tlbsxe",  XRC(31,915,0), X_MASK,     BOOKE, { RA, RB } },
+{ "tlbsx",   XRC(31,914,0), X_MASK,    BOOKE,          { RA, RB } },
+{ "tlbsxe",  XRC(31,915,0), X_MASK,    BOOKE,          { RA, RB } },
 
 { "slbmfee", X(31,915), XRA_MASK,      PPC64,          { RT, RB } },
 
@@ -3406,6 +3422,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 { "tlbwelo", XTLB(31,978,1), XTLB_MASK,        PPC403,         { RT, RA } },
 { "tlbwe",   X(31,978),        X_MASK,         PPC403,         { RS, RA, SH } },
 
+{ "tlbwe",   X(31,978),        X_MASK,         BOOKE,          { RT, RA, SH } },
+
 { "icbi",    X(31,982),        XRT_MASK,       PPC,            { RA, RB } },
 
 { "stfiwx",  X(31,983),        X_MASK,         PPC,            { FRS, RA, RB } },