IBM Z: Remove lpswey parameter

opcodes/
	* s390-opc.c (INSTR_SIY_RD): New instruction format.
	(MASK_SIY_RD): New instruction mask.
	* s390-opc.txt: Change instruction format of lpswey to SIY_RD.

gas/
	* testsuite/gas/s390/zarch-arch14.d: Remove last operand of
	lpswey.
	* testsuite/gas/s390/zarch-arch14.s: Likewise.

(cherry picked from commit a164bbda300d1da6f97bfa14ba7fa22475e61d17)

diff --git a/gas/testsuite/gas/s390/zarch-arch14.d b/gas/testsuite/gas/s390/zarch-arch14.d
index 97c4fd54719eee731666ebeff6159b0c93b24660..775bbc2a5d19624a32c6c01e8a07d0957a6fc725 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-arch14.d
+++ b/gas/testsuite/gas/s390/zarch-arch14.d
@@ -25,7 +25,7 @@ Disassembly of section .text:
 .*:    e6 f1 00 0c d4 55 [      ]*vcnf %v15,%v17,13,12
 .*:    b9 8b 90 6b [    ]*rdp  %r6,%r9,%r11
 .*:    b9 8b 9d 6b [    ]*rdp  %r6,%r9,%r11,13
-.*:    eb fd 68 f0 fd 71 [      ]*lpswey       -10000\(%r6\),253
+.*:    eb 00 68 f0 fd 71 [      ]*lpswey       -10000\(%r6\)
 .*:    b2 00 6f a0 [    ]*lbear        4000\(%r6\)
 .*:    b2 01 6f a0 [    ]*stbear       4000\(%r6\)
 .*:    07 07 [  ]*nopr %r7

diff --git a/gas/testsuite/gas/s390/zarch-arch14.s b/gas/testsuite/gas/s390/zarch-arch14.s
index 830382f0ac5d00746ddb785e0f5b0cd6fd41b53b..9544faa93321271126f5d9e754ace16b2742d638 100644 (file)
--- a/gas/testsuite/gas/s390/zarch-arch14.s
+++ b/gas/testsuite/gas/s390/zarch-arch14.s
@@ -19,6 +19,6 @@ foo:
        vcnf    %v15,%v17,13,12
        rdp     %r6,%r9,%r11
        rdp     %r6,%r9,%r11,13
-       lpswey  -10000(%r6),253
+       lpswey  -10000(%r6)
        lbear   4000(%r6)
        stbear  4000(%r6)

diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c
index 5545dacffffbdb259656aea2420c7670711cfbd2..64453d945f80cb15fdd39a0b385c290362edfb53 100644 (file)
--- a/opcodes/s390-opc.c
+++ b/opcodes/s390-opc.c
@@ -442,6 +442,7 @@ const struct s390_operand s390_operands[] =
 #define INSTR_RX_URRD      4, { U4_8,D_20,X_12,B_16,0,0 }        /* e.g. bc    */
 #define INSTR_SI_RD        4, { D_20,B_16,0,0,0,0 }              /* e.g. lpsw  */
 #define INSTR_SI_URD       4, { D_20,B_16,U8_8,0,0,0 }           /* e.g. cli   */
+#define INSTR_SIY_RD       6, { D20_20,B_16,0,0,0,0 }            /* e.g. lpswey*/
 #define INSTR_SIY_URD      6, { D20_20,B_16,U8_8,0,0,0 }         /* e.g. tmy   */
 #define INSTR_SIY_IRD      6, { D20_20,B_16,I8_8,0,0,0 }         /* e.g. asi   */
 #define INSTR_SIL_RDI      6, { D_20,B_16,I16_32,0,0,0 }         /* e.g. chhsi */
@@ -664,6 +665,7 @@ const struct s390_operand s390_operands[] =
 #define MASK_RX_URRD      { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
 #define MASK_SI_RD        { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
 #define MASK_SI_URD       { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
+#define MASK_SIY_RD       { 0xff, 0xff, 0x00, 0x00, 0x00, 0xff }
 #define MASK_SIY_URD      { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
 #define MASK_SIY_IRD      { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
 #define MASK_SIL_RDI      { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }

diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index aa00b4f3b69e61346a9548fb70c0244657232339..2002234071133a93765df91b8fe8f787048b9733 100644 (file)
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -2041,6 +2041,6 @@ e60000000055 vcnf VRR_VV0UU2 " " arch14 zarch
 
 b98B rdp RRF_RURR2 " " arch14 zarch optparm
 
-eb0000000071 lpswey SIY_URD " " arch14 zarch
+eb0000000071 lpswey SIY_RD " " arch14 zarch
 b200 lbear S_RD " " arch14 zarch
 b201 stbear S_RD " " arch14 zarch