backport 2009-02-05 Peter Bergner <bergner@vnet.ibm.com>

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 39d251911b18e87d042ba2d5a45a29d0b1511407..ec3ff3df66990378ebfa49d6c966a59342a7794c 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2009-03-02  Alan Modra  <amodra@bigpond.net.au>
 
+       2009-02-05  Peter Bergner  <bergner@vnet.ibm.com>
+       * gas/ppc/booke.s ("dcbt", "dcbtst"): New tests.
+       * gas/ppc/booke.d: Likewise.
+       * gas/ppc/power4_32.s: Likewise.
+       * gas/ppc/power4_32.d: Likewise.
+
        2009-01-14  Peter Bergner  <bergner@vnet.ibm.com>
        * gas/ppc/power6.s ("mtfsf", "mtfsf.", "mtfsfi", "mtfsfi."): Add tests.
        * gas/ppc/power6.d: Likewise.

diff --git a/gas/testsuite/gas/ppc/booke.d b/gas/testsuite/gas/ppc/booke.d
index 403fa3f3cc1088f39ed653d852fda08cf94aac16..a7792a86befa5c570e6ea343b04a812c2f62a941 100644 (file)
--- a/gas/testsuite/gas/ppc/booke.d
+++ b/gas/testsuite/gas/ppc/booke.d
@@ -38,3 +38,6 @@ Disassembly of section \.text:
   68:  7c 07 42 a6     mfsprg  r0,7
   6c:  7c 17 43 a6     mtsprg  7,r0
   70:  7c 17 43 a6     mtsprg  7,r0
+  74:  7c 05 32 2c     dcbt    r5,r6
+  78:  7c 05 32 2c     dcbt    r5,r6
+  7c:  7d 05 32 2c     dcbt    8,r5,r6

diff --git a/gas/testsuite/gas/ppc/booke.s b/gas/testsuite/gas/ppc/booke.s
index 4e513051f04b0436a7c7c62858d94f75cce0d565..4061bf1fef8ce0ccda99b3d2c51b3c6e3cfa409d 100644 (file)
--- a/gas/testsuite/gas/ppc/booke.s
+++ b/gas/testsuite/gas/ppc/booke.s
@@ -36,3 +36,7 @@ branch_target_2:
        mfsprg7 0
        mtsprg 7, 0
        mtsprg7 0
+
+       dcbt 5,6
+       dcbt 0,5,6
+       dcbt 8,5,6

diff --git a/gas/testsuite/gas/ppc/power4_32.d b/gas/testsuite/gas/ppc/power4_32.d
index bd5170fdd3a1ad8fb0d9b5d1a334baa380a03a09..1f2db94c7ba8750fd11acd39cd4b1569a26e2932 100644 (file)
--- a/gas/testsuite/gas/ppc/power4_32.d
+++ b/gas/testsuite/gas/ppc/power4_32.d
@@ -41,3 +41,6 @@ Disassembly of section \.text:
   7c:  7c 01 17 ec     dcbz    r1,r2
   80:  7c 23 27 ec     dcbzl   r3,r4
   84:  7c 05 37 ec     dcbz    r5,r6
+  88:  7c 05 32 2c     dcbt    r5,r6
+  8c:  7c 05 32 2c     dcbt    r5,r6
+  90:  7d 05 32 2c     dcbt    r5,r6,8

diff --git a/gas/testsuite/gas/ppc/power4_32.s b/gas/testsuite/gas/ppc/power4_32.s
index 88861a429d35ab8d5332621fd150838d77a6efba..a2fd6a6c432a57e5e2a93895a6f515827cf17677 100644 (file)
--- a/gas/testsuite/gas/ppc/power4_32.s
+++ b/gas/testsuite/gas/ppc/power4_32.s
@@ -34,3 +34,6 @@ start:
        dcbz    1, 2
        dcbzl   3, 4
        dcbz    5, 6
+       dcbt    5,6
+       dcbt    5,6,0
+       dcbt    5,6,8

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 9ac964755f0bd5140675641591a0f1501fe9e3b6..83df7dbfea46cf1a2334568172796ef49642c139 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,10 @@
 2009-03-02  Alan Modra  <amodra@bigpond.net.au>
 
+       2009-02-05  Peter Bergner  <bergner@vnet.ibm.com>
+       * ppc-opc.c: Update copyright year.
+       (powerpc_opcodes) <"dcbt", "dcbtst">: Deprecate the Embedded operand
+       ordering for POWER4 and later and use the correct Server ordering.
+
        2009-01-14  Peter Bergner  <bergner@vnet.ibm.com>
        * ppc-dis.c (print_insn_powerpc): Skip insn if it is deprecated.
        * ppc-opc.c (powerpc_opcodes) <mtfsf, mtfsf.>: Deprecate the two

diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index 511fd81a77ec182851b4b4c09b7a03e31ce5fb6b..5ce87b7165092f35b87081c77d4e80f5e98cacca 100644 (file)
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -1,6 +1,6 @@
 /* ppc-opc.c -- PowerPC opcode list
    Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support
 
    This file is part of the GNU opcodes library.
@@ -3636,7 +3636,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"mtsrin",     X(31,242),      XRA_MASK,    PPC32,     PPCNONE,        {RS, RB}},
 {"mtsri",      X(31,242),      XRA_MASK,    POWER32,   PPCNONE,        {RS, RB}},
 
-{"dcbtst",     X(31,246),      X_MASK,      PPC,       PPCNONE,        {CT, RA, RB}},
+{"dcbtst",     X(31,246),      X_MASK,      PPC,       POWER4,         {CT, RA, RB}},
+{"dcbtst",     X(31,246),      X_MASK,      POWER4,    PPCNONE,        {RA, RB, CT}},
 
 {"stbux",      X(31,247),      X_MASK,      COM,       PPCNONE,        {RS, RAS, RB}},
 
@@ -3667,7 +3668,8 @@ const struct powerpc_opcode powerpc_opcodes[] = {
 {"lscbx",      XRC(31,277,0),  X_MASK,      M601,      PPCNONE,        {RT, RA, RB}},
 {"lscbx.",     XRC(31,277,1),  X_MASK,      M601,      PPCNONE,        {RT, RA, RB}},
 
-{"dcbt",       X(31,278),      X_MASK,      PPC,       PPCNONE,        {CT, RA, RB}},
+{"dcbt",       X(31,278),      X_MASK,      PPC,       POWER4,         {CT, RA, RB}},
+{"dcbt",       X(31,278),      X_MASK,      POWER4,    PPCNONE,        {RA, RB, CT}},
 
 {"lhzx",       X(31,279),      X_MASK,      COM,       PPCNONE,        {RT, RA0, RB}},