51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
|
|
From: Andreas Krebbel <krebbel@linux.ibm.com>
|
|
Date: Wed, 4 Aug 2021 16:51:36 +0200
|
|
Subject: gdb-rhbz2012818-ibmz-update-4of5.patch
|
|
|
|
;; IBM Z: Remove lpswey parameter
|
|
;; (Andreas Krebbel, RHBZ 2012818)
|
|
|
|
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/opcodes/s390-opc.c b/opcodes/s390-opc.c
|
|
--- 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
|
|
--- a/opcodes/s390-opc.txt
|
|
+++ b/opcodes/s390-opc.txt
|
|
@@ -2046,6 +2046,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
|