[16/20] s390: Rename insn format RRF_FE0FF to RRD_FE0FF

Message ID 20260930081834.2948939-38-jremus@linux.ibm.com
State New
Headers
Series s390: Instruction cleanups |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Test passed

Commit Message

Jens Remus Sept. 30, 2026, 8:18 a.m. UTC
  Former instruction format RRF[-a], where the first operand is in bits
16-19, has been separated into the new RRD format since IBM z196. [1, 2]

[1]: IBM z/Architecture Principles of Operation, SA22-7832-07, IBM z10,
     https://publibfp.dhe.ibm.com/epubs/pdf/dz9zr007.pdf

[2]: IBM z/Architecture Principles of Operation, SA22-7832-08, IBM z196,
     https://publibfp.dhe.ibm.com/epubs/pdf/dz9zr008.pdf

opcodes/
	* s390-opc.c (INSTR_RRF_FE0FF, MASK_RRF_FE0FF): Rename to
	INSTR_RRD_FE0FF and MASK_RRD_FE0FF.
	* s390-opc.txt (myr): Use renamed insn format RRD_FE0FF.

Signed-off-by: Jens Remus <jremus@linux.ibm.com>
---
 opcodes/s390-opc.c   | 4 ++--
 opcodes/s390-opc.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
  

Patch

diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c
index 7222d2368610..3b15c9f95d9f 100644
--- a/opcodes/s390-opc.c
+++ b/opcodes/s390-opc.c
@@ -340,6 +340,7 @@  unused_s390_operands_static_asserts (void)
 #define INSTR_RIS_RURDU    6, { R_8,U8_32,U4_12,D_20,B_16,0 }    /* e.g. clib  */
 #define INSTR_RIS_R0RDU    6, { R_8,U8_32,D_20,B_16,0,0 }        /* e.g. clibne*/
 #define INSTR_RRD_F0FF     4, { F_16,F_24,F_28,0,0,0 }           /* e.g. madbr */
+#define INSTR_RRD_FE0FF    4, { FE_16,F_24,F_28,0,0,0 }          /* e.g. myr   */
 #define INSTR_RRE_00       4, { 0,0,0,0,0,0 }                    /* e.g. palb  */
 #define INSTR_RRE_0R       4, { R_28,0,0,0,0,0 }                 /* e.g. tb    */
 #define INSTR_RRE_AA       4, { A_24,A_28,0,0,0,0 }              /* e.g. cpya  */
@@ -360,7 +361,6 @@  unused_s390_operands_static_asserts (void)
 #define INSTR_RRE_RERE     4, { RE_24,RE_28,0,0,0,0 }            /* e.g. cuse  */
 #define INSTR_RRE_FR       4, { F_24,R_28,0,0,0,0 }              /* e.g. ldgr  */
 #define INSTR_RRE_FER      4, { FE_24,R_28,0,0,0,0 }             /* e.g. cxfbr */
-#define INSTR_RRF_FE0FF    4, { FE_16,F_24,F_28,0,0,0 }          /* e.g. myr   */
 #define INSTR_RRF_F0FF2    4, { F_24,F_16,F_28,0,0,0 }           /* e.g. cpsdr */
 #define INSTR_RRF_F0FR     4, { F_24,F_16,R_28,0,0,0 }           /* e.g. iedtr */
 #define INSTR_RRF_FE0FER   4, { FE_24,FE_16,R_28,0,0,0 }         /* e.g. iextr */
@@ -575,6 +575,7 @@  unused_s390_operands_static_asserts (void)
 #define MASK_RIS_RURDU    { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
 #define MASK_RIS_R0RDU    { 0xff, 0x0f, 0x00, 0x00, 0x00, 0xff }
 #define MASK_RRD_F0FF     { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
+#define MASK_RRD_FE0FF    { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
 #define MASK_RRE_00       { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 }
 #define MASK_RRE_0R       { 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00 }
 #define MASK_RRE_AA       { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 }
@@ -595,7 +596,6 @@  unused_s390_operands_static_asserts (void)
 #define MASK_RRE_RERE     { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 }
 #define MASK_RRE_FR       { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 }
 #define MASK_RRE_FER      { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 }
-#define MASK_RRF_FE0FF    { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
 #define MASK_RRF_F0FF2    { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
 #define MASK_RRF_F0FR     { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
 #define MASK_RRF_FE0FER   { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
index bf0b6362d56a..45637501e27b 100644
--- a/opcodes/s390-opc.txt
+++ b/opcodes/s390-opc.txt
@@ -804,7 +804,7 @@  b2a7 cutfu RRF_U0RERE "convert utf-8 to unicode" z9-109 zarch optparm
 b9b0 cu14 RRF_U0RERE "convert utf-8 to utf-32" z9-109 zarch optparm
 b9be srstu RRE_RR "search string unicode" z9-109 zarch
 d0 trtr SS_L0RDRD "tranlate and test reverse" z9-109 zarch
-b33b myr RRF_FE0FF "multiply unnormalized long hfp" z9-109 zarch
+b33b myr RRD_FE0FF "multiply unnormalized long hfp" z9-109 zarch
 b33d myhr RRD_F0FF "multiply unnormalized long hfp high" z9-109 zarch
 b339 mylr RRD_F0FF "multiply unnormalized long hfp low" z9-109 zarch
 ed000000003b my RXF_FRRDFE "multiply unnormalized long hfp" z9-109 zarch