Skip to content

Commit 930ab0a

Browse files
mundaymrsc
authored andcommitted
cmd/asm, cmd/internal/obj/s390x: fix VFMA and VFMS encoding
The m5 and m6 fields were the wrong way round. Fixes #17444. Change-Id: I10297064f2cd09d037eac581c96a011358f70aae Reviewed-on: https://go-review.googlesource.com/31130 Run-TryBot: Michael Munday <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Russ Cox <[email protected]>
1 parent 0f29942 commit 930ab0a

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/cmd/asm/internal/asm/testdata/s390x.s

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,10 @@ TEXT main·foo(SB),7,$16-0 // TEXT main.foo(SB), 7, $16-0
323323
VERIMB $2, V31, V1, V2 // VERIMB V31, V1, $2, V2 // e72f10020472
324324
VSEL V1, V2, V3, V4 // VSEL V2, V3, V1, V4 // e7412000308d
325325
VGFMAH V21, V31, V24, V0 // VGFMAH V31, V24, V21, V0 // e705f10087bc
326-
WFMSDB V2, V25, V24, V31 // WFMSDB V25, V24, V2, V31 // e7f298038b8e
326+
VFMADB V16, V8, V9, V10 // VFMADB V8, V9, V16, V10 // e7a08300948f
327+
WFMADB V17, V18, V19, V20 // WFMADB V18, V19, V17, V20 // e74123083f8f
328+
VFMSDB V2, V25, V24, V31 // VFMSDB V25, V24, V2, V31 // e7f293008b8e
329+
WFMSDB V31, V2, V3, V4 // WFMSDB V2, V3, V31, V4 // e74f2308348e
327330
VPERM V31, V0, V2, V3 // VPERM V0, V2, V31, V3 // e73f0000248c
328331
VPDI $1, V2, V31, V1 // VPDI V2, V31, $1, V1 // e712f0001284
329332
VLEG $1, (R3), V1 // VLEG (R3), $1, V1 // e71030001002

src/cmd/internal/obj/s390x/asmz.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4121,7 +4121,7 @@ func asmout(ctxt *obj.Link, asm *[]byte) {
41214121
v2 := uint32(p.From3.Reg)
41224122
v3 := uint32(p.From.Reg)
41234123
v4 := uint32(p.Reg)
4124-
zVRRe(op, v1, v2, v3, m5, m6, v4, asm)
4124+
zVRRe(op, v1, v2, v3, m6, m5, v4, asm)
41254125

41264126
case 122: // VRR-f LOAD VRS FROM GRS DISJOINT
41274127
op, _, _ := vop(p.As)

0 commit comments

Comments
 (0)