Skip to content

Commit ab22f8d

Browse files
Jens RemusVasily Gorbik
authored andcommitted
s390/disassembler: Remove duplicate instruction format RSY_RDRU
Instruction format RSY_RDRU is a duplicate of RSY_RURD2. Use the latter, as it follows the s390-specific conventions for instruction format naming used in binutils. Reviewed-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Jens Remus <jremus@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent 5c9a274 commit ab22f8d

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

arch/s390/kernel/dis.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ static const unsigned char formats[][6] = {
259259
[INSTR_RSL_R0RD] = { D_20, L4_8, B_16, 0, 0, 0 },
260260
[INSTR_RSY_AARD] = { A_8, A_12, D20_20, B_16, 0, 0 },
261261
[INSTR_RSY_CCRD] = { C_8, C_12, D20_20, B_16, 0, 0 },
262-
[INSTR_RSY_RDRU] = { R_8, D20_20, B_16, U4_12, 0, 0 },
263262
[INSTR_RSY_RRRD] = { R_8, R_12, D20_20, B_16, 0, 0 },
264263
[INSTR_RSY_RURD] = { R_8, U4_12, D20_20, B_16, 0, 0 },
265264
[INSTR_RSY_RURD2] = { R_8, D20_20, B_16, U4_12, 0, 0 },

arch/s390/tools/opcodes.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,17 +1118,17 @@ eb54 niy SIY_URD
11181118
eb55 cliy SIY_URD
11191119
eb56 oiy SIY_URD
11201120
eb57 xiy SIY_URD
1121-
eb60 lric RSY_RDRU
1122-
eb61 stric RSY_RDRU
1123-
eb62 mric RSY_RDRU
1121+
eb60 lric RSY_RURD2
1122+
eb61 stric RSY_RURD2
1123+
eb62 mric RSY_RURD2
11241124
eb6a asi SIY_IRD
11251125
eb6e alsi SIY_IRD
11261126
eb71 lpswey SIY_RD
11271127
eb7a agsi SIY_IRD
11281128
eb7e algsi SIY_IRD
11291129
eb80 icmh RSY_RURD
11301130
eb81 icmy RSY_RURD
1131-
eb8a sqbs RSY_RDRU
1131+
eb8a sqbs RSY_RURD2
11321132
eb8e mvclu RSY_RRRD
11331133
eb8f clclu RSY_RRRD
11341134
eb90 stmy RSY_RRRD

0 commit comments

Comments
 (0)