From: Ben Shi Date: Fri, 23 Jun 2017 08:05:37 +0000 (+0000) Subject: cmd/internal/obj/arm: fix wrong encoding of MULBB X-Git-Tag: go1.9beta2~7 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3785457c765018a8ca5a399da177ddc5573db68d;p=gostls13.git cmd/internal/obj/arm: fix wrong encoding of MULBB "MULBB R1, R2, R3" is encoded to 0xe163f182, which should be 0xe1630182. This patch fix it. fix #20764 Change-Id: I9d3c3ffa40ecde86638e5e083eacc67578caebf4 Reviewed-on: https://go-review.googlesource.com/46491 Run-TryBot: Cherry Zhang TryBot-Result: Gobot Gobot Reviewed-by: Cherry Zhang --- diff --git a/src/cmd/asm/internal/asm/testdata/arm.s b/src/cmd/asm/internal/asm/testdata/arm.s index e5ad86cdc2..8f743e7bfa 100644 --- a/src/cmd/asm/internal/asm/testdata/arm.s +++ b/src/cmd/asm/internal/asm/testdata/arm.s @@ -975,7 +975,7 @@ jmp_label_3: MULL R1, R2, (R4, R3) // 9231c4e0 MULL.S R1, R2, (R4, R3) // 9231d4e0 MMUL R1, R2, R3 // 12f153e7 - MULBB R1, R2, R3 // 82f163e1 + MULBB R1, R2, R3 // 820163e1 MULWB R1, R2, R3 // a20123e1 MULWT R1, R2, R3 // e20123e1 diff --git a/src/cmd/internal/obj/arm/asm5.go b/src/cmd/internal/obj/arm/asm5.go index 6cb6072769..0836a7fa4e 100644 --- a/src/cmd/internal/obj/arm/asm5.go +++ b/src/cmd/internal/obj/arm/asm5.go @@ -2866,7 +2866,7 @@ func (c *ctxt5) oprrr(p *obj.Prog, a obj.As, sc int) uint32 { return o&(0xf<<28) | 0x12<<20 | 0xa<<4 case AMULBB: - return o&(0xf<<28) | 0x16<<20 | 0xf<<12 | 0x8<<4 + return o&(0xf<<28) | 0x16<<20 | 0x8<<4 case AMULAWT: return o&(0xf<<28) | 0x12<<20 | 0xc<<4