opcodes/

	* ppc-opc.c <RSQ, RTQ>: Use PPC_OPERAND_GPR.

gas/testsuite/
	* gas/ppc/power4.s <lq, stq>: Add more tests.
	* gas/ppc/power4.d: Likewise.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5d903abe034165ae1c43286b06517c3ed6cc9167..5ccb640685766e32db76cf4618baa5511350f171 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-15  Peter Bergner  <bergner@vnet.ibm.com>
+
+       * gas/ppc/power4.s <lq, stq>: Add more tests.
+       * gas/ppc/power4.d: Likewise.
+
 2012-08-15  Peter Bergner  <bergner@vnet.ibm.com>
 
        * gas/ppc/common.d ("nop", "xnop"): Add tests.

diff --git a/gas/testsuite/gas/ppc/power4.d b/gas/testsuite/gas/ppc/power4.d
index 333c90d6548b9111510dffca93854962591f6c6b..f5978c8ff35a9ee1aadeffcf1653594f7d566dab 100644 (file)
--- a/gas/testsuite/gas/ppc/power4.d
+++ b/gas/testsuite/gas/ppc/power4.d
@@ -10,7 +10,7 @@ start address 0x0+
 
 Sections:
 Idx Name +Size +VMA +LMA +File off +Algn
- +0 \.text +0+c4 +0+ +0+ +.*
+ +0 \.text +0+dc +0+ +0+ +.*
  +CONTENTS, ALLOC, LOAD, RELOC, READONLY, CODE
  +1 \.data +0+10 +0+ +0+ +.*
  +CONTENTS, ALLOC, LOAD, DATA
@@ -102,3 +102,9 @@ Disassembly of section \.text:
  +b8:  7c 01 17 ec     dcbz    r1,r2
  +bc:  7c 23 27 ec     dcbzl   r3,r4
  +c0:  7c 05 37 ec     dcbz    r5,r6
+ +c4:  e0 40 00 10     lq      r2,16\(0\)
+ +c8:  e0 05 00 10     lq      r0,16\(r5\)
+ +cc:  e0 45 00 10     lq      r2,16\(r5\)
+ +d0:  f8 40 00 12     stq     r2,16\(0\)
+ +d4:  f8 05 00 12     stq     r0,16\(r5\)
+ +d8:  f8 45 00 12     stq     r2,16\(r5\)

diff --git a/gas/testsuite/gas/ppc/power4.s b/gas/testsuite/gas/ppc/power4.s
index f2a162dc95390dde48debb6eef3e958756a9fa63..7e9042d71635d960f3d3504b397e9f31ca0534b7 100644 (file)
--- a/gas/testsuite/gas/ppc/power4.s
+++ b/gas/testsuite/gas/ppc/power4.s
@@ -72,6 +72,13 @@ dsym1:
        dcbzl   3, 4
        dcbz    5, 6
 
+       lq 2,16(0)
+       lq 0,16(5)
+       lq 2,16(5)
+       stq 2,16(0)
+       stq 0,16(5)
+       stq 2,16(5)
+
        .section        ".data"
 usym0: .llong  0xcafebabe
 usym1:

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 9399da71f8e72a89fb7686e8fd753322f02219bf..b5a75f6acb14ab5e2d1f80928d506bf24572ea36 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Peter Bergner  <bergner@vnet.ibm.com>
+
+       * ppc-opc.c <RSQ, RTQ>: Use PPC_OPERAND_GPR.
+
 2012-08-15  Peter Bergner  <bergner@vnet.ibm.com>
 
        * ppc-opc.c <xnop, yield, mdoio, mdoom>: New extended mnemonics.

diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index 911b53b41a89c1ca3bfc23f93fc5ef43e7c246b1..1b15568b20c824253250f870b482d88113514227 100644 (file)
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -512,11 +512,11 @@ const struct powerpc_operand powerpc_operands[] =
 #define RD RS
   { 0x1f, 21, NULL, NULL, PPC_OPERAND_GPR },
 
-  /* The RS and RT fields of the DS form stq instruction, which have
-     special value restrictions.  */
+  /* The RS and RT fields of the DS form stq and DQ form lq instructions,
+     which have special value restrictions.  */
 #define RSQ RS + 1
 #define RTQ RSQ
-  { 0x1e, 21, NULL, NULL, PPC_OPERAND_GPR_0 },
+  { 0x1e, 21, NULL, NULL, PPC_OPERAND_GPR },
 
   /* The RS field of the tlbwe instruction, which is optional.  */
 #define RSO RSQ + 1