This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[Committed] S/390: Fix operands of lxr, rrdtr and rrxtr
- From: "Andreas Krebbel" <Andreas dot Krebbel at de dot ibm dot com>
- To: binutils at sourceware dot org
- Cc: schwidefsky at de dot ibm dot com
- Date: Fri, 15 Aug 2008 14:12:06 +0200
- Subject: [Committed] S/390: Fix operands of lxr, rrdtr and rrxtr
Hello,
the attached patch fixes the operands of 3 instructions.
The rrdtr and rrxtr instruction now get a gpr as third parameter.
That changed from the preliminary document I have used to implement
DFP support to the final documentation.
A much more ancient bug is that lxr has been described as GPR to GPR
instruction although it moves between FPRs.
Both bugs are in no way critical and only affect the objdump output
since the layout of FPRs and GPRs in the opcode is identical.
Committed as obvious.
Bye,
-Andreas-
2008-08-15 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* s390-opc.c (INSTR_RRF_FFRU, MASK_RRF_FFRU): New instruction format.
* s390-opc.txt (lxr, rrdtr, rrxtr): Fix instruction format.
2008-08-15 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* gas/s390/esa-g5.d: lxr operands are floating point.
* gas/s390/esa-g5.s: Likewise.
* gas/testsuite/gas/s390/zarch-z9-ec.d: rrdtr, rrxtr third
operands is gpr.
* gas/testsuite/gas/s390/zarch-z9-ec.s: Likewise.
Index: gas/testsuite/gas/s390/esa-g5.d
===================================================================
*** gas/testsuite/gas/s390/esa-g5.d.orig 2008-03-18 17:58:09.000000000 +0100
--- gas/testsuite/gas/s390/esa-g5.d 2008-08-15 13:42:53.000000000 +0200
*************** Disassembly of section .text:
*** 268,274 ****
.*: ed 65 af ff 00 06 [ ]*lxeb %f6,4095\(%r5,%r10\)
.*: b3 06 00 69 [ ]*lxebr %f6,%f9
.*: b3 26 00 69 [ ]*lxer %f6,%f9
! .*: b3 65 00 69 [ ]*lxr %r6,%r9
.*: b3 75 00 60 [ ]*lzdr %f6
.*: b3 74 00 60 [ ]*lzer %f6
.*: b3 76 00 60 [ ]*lzxr %f6
--- 268,274 ----
.*: ed 65 af ff 00 06 [ ]*lxeb %f6,4095\(%r5,%r10\)
.*: b3 06 00 69 [ ]*lxebr %f6,%f9
.*: b3 26 00 69 [ ]*lxer %f6,%f9
! .*: b3 65 00 69 [ ]*lxr %f6,%f9
.*: b3 75 00 60 [ ]*lzdr %f6
.*: b3 74 00 60 [ ]*lzer %f6
.*: b3 76 00 60 [ ]*lzxr %f6
Index: gas/testsuite/gas/s390/esa-g5.s
===================================================================
*** gas/testsuite/gas/s390/esa-g5.s.orig 2008-03-18 17:58:09.000000000 +0100
--- gas/testsuite/gas/s390/esa-g5.s 2008-08-15 13:42:37.000000000 +0200
*************** foo:
*** 262,268 ****
lxeb %f6,4095(%r5,%r10)
lxebr %f6,%f9
lxer %f6,%f9
! lxr %r6,%r9
lzdr %f6
lzer %f6
lzxr %f6
--- 262,268 ----
lxeb %f6,4095(%r5,%r10)
lxebr %f6,%f9
lxer %f6,%f9
! lxr %f6,%f9
lzdr %f6
lzer %f6
lzxr %f6
Index: gas/testsuite/gas/s390/zarch-z9-ec.d
===================================================================
*** gas/testsuite/gas/s390/zarch-z9-ec.d.orig 2008-02-20 16:30:15.000000000 +0100
--- gas/testsuite/gas/s390/zarch-z9-ec.d 2008-08-15 13:42:04.000000000 +0200
*************** Disassembly of section .text:
*** 53,60 ****
.*: b3 d8 40 62 [ ]*mxtr %f6,%f2,%f4
.*: b3 f5 21 64 [ ]*qadtr %f6,%f2,%f4,1
.*: b3 fd 21 64 [ ]*qaxtr %f6,%f2,%f4,1
! .*: b3 f7 21 64 [ ]*rrdtr %f6,%f2,%f4,1
! .*: b3 ff 21 64 [ ]*rrxtr %f6,%f2,%f4,1
.*: b2 b9 10 03 [ ]*srnmt 3\(%r1\)
.*: b3 85 00 20 [ ]*sfasr %r2
.*: ed 21 40 03 60 40 [ ]*sldt %f6,%f2,3\(%r1,%r4\)
--- 53,60 ----
.*: b3 d8 40 62 [ ]*mxtr %f6,%f2,%f4
.*: b3 f5 21 64 [ ]*qadtr %f6,%f2,%f4,1
.*: b3 fd 21 64 [ ]*qaxtr %f6,%f2,%f4,1
! .*: b3 f7 21 64 [ ]*rrdtr %f6,%f2,%r4,1
! .*: b3 ff 21 64 [ ]*rrxtr %f6,%f2,%r4,1
.*: b2 b9 10 03 [ ]*srnmt 3\(%r1\)
.*: b3 85 00 20 [ ]*sfasr %r2
.*: ed 21 40 03 60 40 [ ]*sldt %f6,%f2,3\(%r1,%r4\)
Index: gas/testsuite/gas/s390/zarch-z9-ec.s
===================================================================
*** gas/testsuite/gas/s390/zarch-z9-ec.s.orig 2008-02-20 16:30:15.000000000 +0100
--- gas/testsuite/gas/s390/zarch-z9-ec.s 2008-08-15 13:41:48.000000000 +0200
*************** foo:
*** 47,54 ****
mxtr %f6,%f2,%f4
qadtr %f6,%f2,%f4,1
qaxtr %f6,%f2,%f4,1
! rrdtr %f6,%f2,%f4,1
! rrxtr %f6,%f2,%f4,1
srnmt 3(%r1)
sfasr %r2
sldt %f6,%f2,3(%r1,%r4)
--- 47,54 ----
mxtr %f6,%f2,%f4
qadtr %f6,%f2,%f4,1
qaxtr %f6,%f2,%f4,1
! rrdtr %f6,%f2,%r4,1
! rrxtr %f6,%f2,%r4,1
srnmt 3(%r1)
sfasr %r2
sldt %f6,%f2,3(%r1,%r4)
Index: opcodes/s390-opc.c
===================================================================
*** opcodes/s390-opc.c.orig 2008-06-25 13:44:55.000000000 +0200
--- opcodes/s390-opc.c 2008-08-15 13:40:51.000000000 +0200
*************** const struct s390_operand s390_operands[
*** 274,279 ****
--- 274,280 ----
#define INSTR_RRF_UUFF 4, { F_24,U4_16,F_28,U4_20,0,0 } /* e.g. fidtr */
#define INSTR_RRF_0UFF 4, { F_24,F_28,U4_20,0,0,0 } /* e.g. ldetr */
#define INSTR_RRF_FFFU 4, { F_24,F_16,F_28,U4_20,0,0 } /* e.g. qadtr */
+ #define INSTR_RRF_FFRU 4, { F_24,F_16,R_28,U4_20,0,0 } /* e.g. rrdtr */
#define INSTR_RRF_M0RR 4, { R_24,R_28,M_16,0,0,0 } /* e.g. sske */
#define INSTR_RRF_U0RR 4, { R_24,R_28,U4_16,0,0,0 } /* e.g. clrt */
#define INSTR_RRF_00RR 4, { R_24,R_28,0,0,0,0 } /* e.g. clrtne */
*************** const struct s390_operand s390_operands[
*** 378,383 ****
--- 379,385 ----
#define MASK_RRF_UUFF { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }
#define MASK_RRF_0UFF { 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00 }
#define MASK_RRF_FFFU { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }
+ #define MASK_RRF_FFRU { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }
#define MASK_RRF_M0RR { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
#define MASK_RRF_U0RR { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
#define MASK_RRF_00RR { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 }
Index: opcodes/s390-opc.txt
===================================================================
*** opcodes/s390-opc.txt.orig 2008-04-10 14:24:22.000000000 +0200
--- opcodes/s390-opc.txt 2008-08-15 13:37:41.000000000 +0200
*************** b336 sqxr RRE_FF "square root extended h
*** 577,583 ****
ed0000000034 sqe RXE_FRRD "square root short hfp" g5 esa,zarch
b263 cmpsc RRE_RR "compression call" g5 esa,zarch
eb00000000c0 tp RSL_R0RD "test decimal" g5 esa,zarch
! b365 lxr RRE_RR "load extended hfp" g5 esa,zarch
b22e pgin RRE_RR "page in" g5 esa,zarch
b22f pgout RRE_RR "page out" g5 esa,zarch
b276 xsch S_00 "cancel subchannel" g5 esa,zarch
--- 577,583 ----
ed0000000034 sqe RXE_FRRD "square root short hfp" g5 esa,zarch
b263 cmpsc RRE_RR "compression call" g5 esa,zarch
eb00000000c0 tp RSL_R0RD "test decimal" g5 esa,zarch
! b365 lxr RRE_FF "load extended fp" g5 esa,zarch
b22e pgin RRE_RR "page in" g5 esa,zarch
b22f pgout RRE_RR "page out" g5 esa,zarch
b276 xsch S_00 "cancel subchannel" g5 esa,zarch
*************** b3d0 mdtr RRR_F0FF "multiply long dfp" z
*** 833,840 ****
b3d8 mxtr RRR_F0FF "multiply extended dfp" z9-ec zarch
b3f5 qadtr RRF_FFFU "Quantize long dfp" z9-ec zarch
b3fd qaxtr RRF_FFFU "Quantize extended dfp" z9-ec zarch
! b3f7 rrdtr RRF_FFFU "Reround long dfp" z9-ec zarch
! b3ff rrxtr RRF_FFFU "Reround extended dfp" z9-ec zarch
b2b9 srnmt S_RD "set rounding mode dfp" z9-ec zarch
b385 sfasr RRE_R0 "set fpc and signal" z9-ec zarch
ed0000000040 sldt RXF_FRRDF "shift coefficient left long dfp" z9-ec zarch
--- 833,840 ----
b3d8 mxtr RRR_F0FF "multiply extended dfp" z9-ec zarch
b3f5 qadtr RRF_FFFU "Quantize long dfp" z9-ec zarch
b3fd qaxtr RRF_FFFU "Quantize extended dfp" z9-ec zarch
! b3f7 rrdtr RRF_FFRU "Reround long dfp" z9-ec zarch
! b3ff rrxtr RRF_FFRU "Reround extended dfp" z9-ec zarch
b2b9 srnmt S_RD "set rounding mode dfp" z9-ec zarch
b385 sfasr RRE_R0 "set fpc and signal" z9-ec zarch
ed0000000040 sldt RXF_FRRDF "shift coefficient left long dfp" z9-ec zarch