2012-11-20 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>

	* s390-opc.txt: Fix srstu and strag opcodes.

2012-11-20  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* gas/s390/zarch-z9-109.d: Fix srstu opcode.
	* gas/s390/zarch-z900.d: Replace lasp with strag.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 51405aa..8c21a0c 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * gas/s390/zarch-z9-109.d: Fix srstu opcode.
+       * gas/s390/zarch-z900.d: Replace lasp with strag.
+
 2012-11-14  David Holsgrove  <david.holsgrove@xilinx.com>
 
        * gas/microblaze/allinsn.s: Add mbar and sleep

diff --git a/gas/testsuite/gas/s390/zarch-z9-109.d b/gas/testsuite/gas/s390/zarch-z9-109.d
index cb327e1..3715b42 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-z9-109.d
+++ b/gas/testsuite/gas/s390/zarch-z9-109.d
@@ -63,6 +63,6 @@ Disassembly of section .text:
 .*:    ed 95 af ff 60 3a [      ]*may  %f6,%f9,4095\(%r5,%r10\)
 .*:    ed 95 af ff 60 3c [      ]*mayh %f6,%f9,4095\(%r5,%r10\)
 .*:    ed 95 af ff 60 38 [      ]*mayl %f6,%f9,4095\(%r5,%r10\)
-.*:    b9 eb 00 67 [    ]*srstu        %r6,%r7
+.*:    b9 be 00 67 [    ]*srstu        %r6,%r7
 .*:    d0 16 5f ff ad 05 [      ]*trtr 4095\(23,%r5\),3333\(%r10\)
 .*:    07 07 [  ]*nopr %r7

diff --git a/gas/testsuite/gas/s390/zarch-z900.d b/gas/testsuite/gas/s390/zarch-z900.d
index 561fca6..8491a8f 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-z900.d
+++ b/gas/testsuite/gas/s390/zarch-z900.d
@@ -138,7 +138,7 @@ Disassembly of section .text:
 .*:    eb 96 5f ff 00 24 [     ]*stmg  %r9,%r6,4095\(%r5\)
 .*:    eb 96 5f ff 00 26 [     ]*stmh  %r9,%r6,4095\(%r5\)
 .*:    e3 95 af ff 00 8e [     ]*stpq  %r9,4095\(%r5,%r10\)
-.*:    e5 00 5f ff 9f ff [     ]*lasp  4095\(%r5\),4095\(%r9\)
+.*:    e5 02 5f ff 9f ff [     ]*strag 4095\(%r5\),4095\(%r9\)
 .*:    e3 95 af ff 00 2f [     ]*strvg %r9,4095\(%r5,%r10\)
 .*:    b9 25 00 96 [   ]*sturg %r9,%r6
 .*:    a7 92 ff ff [   ]*tmhh  %r9,65535
@@ -146,4 +146,4 @@ Disassembly of section .text:
 .*:    eb 96 5f ff 00 0f [     ]*tracg %r9,%r6,4095\(%r5\)
 .*:    e3 95 af ff 00 82 [     ]*xg    %r9,4095\(%r5,%r10\)
 .*:    b9 82 00 96 [   ]*xgr   %r9,%r6
-.*:    07 07 [  ]*nopr %r7
\ No newline at end of file
+.*:    07 07 [  ]*nopr %r7

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 4b022da..4849206 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * s390-opc.txt: Fix srstu and strag opcodes.
+
 2012-11-14  David Holsgrove  <david.holsgrove@xilinx.com>
 
        * microblaze-opc.h: Define new instruction type INST_TYPE_IMM5,

diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index cf9f079..60757c8 100644 (file)
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -452,7 +452,7 @@ eb0000000096 lmh RSE_RRRD "load multiple high" z900 zarch
 ef lmd SS_RRRDRD3 "load multiple disjoint" z900 zarch
 eb000000000f tracg RSE_RRRD "trace 64" z900 zarch
 e30000000003 lrag RXE_RRRD "load real address 64" z900 zarch
-e50000000002 strag SSE_RDRD "store read address" z900 zarch
+e502 strag SSE_RDRD "store read address" z900 zarch
 eb0000000025 stctg RSE_CCRD "store control 64" z900 zarch
 eb000000002f lctlg RSE_CCRD "load control 64" z900 zarch
 eb0000000030 csg RSE_RRRD "compare and swap 64" z900 zarch
@@ -781,7 +781,7 @@ b9b2 cu41 RRE_RERE "convert utf-32 to utf-8" z9-109 zarch
 b2a7 cu12 RRF_M0RERE "convert utf-8 to utf-16" z9-109 zarch
 b2a7 cutfu RRF_M0RERE "convert utf-8 to unicode" z9-109 zarch
 b9b0 cu14 RRF_M0RERE "convert utf-8 to utf-32" z9-109 zarch
-b9eb srstu RRE_RR "search string unicode" z9-109 zarch
+b9be srstu RRE_RR "search string unicode" z9-109 zarch
 d0 trtr SS_L0RDRD "tranlate and test reverse" z9-109 zarch
 # z9-109 unnormalized hfp multiply & multiply and add
 b33b myr RRF_FE0FF "multiply unnormalized long hfp" z9-109 zarch