cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-17 13:24:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd/compile: fix 32-bit unsigned division on 64-bit machines

Browse Source 
The type of an intermediate multiply was wrong.  When that
intermediate multiply was spilled, the top 32 bits were lost.

Fixes #19153

Change-Id: Ib29350a4351efa405935b7f7ee3c112668e64108
Reviewed-on: https://go-review.googlesource.com/37212
Run-TryBot: Keith Randall <khr@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
This commit is contained in:
Keith Randall 2017-02-17 11:36:08 -08:00
parent 4498b68390
commit a9292b833b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/compile/internal/ssa/gen/generic.rules
View File

@ -1013,7 +1013,7 @@
(Rsh64Ux64 <config.fe.TypeUInt64()> (Rsh64Ux64 <config.fe.TypeUInt64()>
(Avg64u (Avg64u
(Lsh64x64 <config.fe.TypeUInt64()> (ZeroExt32to64 x) (Const64 <config.fe.TypeUInt64()> [32])) (Lsh64x64 <config.fe.TypeUInt64()> (ZeroExt32to64 x) (Const64 <config.fe.TypeUInt64()> [32]))
(Mul64 <config.fe.TypeUInt32()> (Mul64 <config.fe.TypeUInt64()>
(Const64 <config.fe.TypeUInt32()> [int64(umagic(32,c).m)]) (Const64 <config.fe.TypeUInt32()> [int64(umagic(32,c).m)])
(ZeroExt32to64 x))) (ZeroExt32to64 x)))
(Const64 <config.fe.TypeUInt64()> [32+umagic(32,c).s-1]))) (Const64 <config.fe.TypeUInt64()> [32+umagic(32,c).s-1])))

4
src/cmd/compile/internal/ssa/rewritegeneric.go
View File

@ -2813,7 +2813,7 @@ func rewriteValuegeneric_OpDiv32u(v *Value, config *Config) bool {
} }
// match: (Div32u x (Const32 [c])) // match: (Div32u x (Const32 [c]))
// cond: umagicOK(32, c) && config.RegSize == 8 // cond: umagicOK(32, c) && config.RegSize == 8
// result: (Trunc64to32 (Rsh64Ux64 <config.fe.TypeUInt64()> (Avg64u (Lsh64x64 <config.fe.TypeUInt64()> (ZeroExt32to64 x) (Const64 <config.fe.TypeUInt64()> [32])) (Mul64 <config.fe.TypeUInt32()> (Const64 <config.fe.TypeUInt32()> [int64(umagic(32,c).m)]) (ZeroExt32to64 x))) (Const64 <config.fe.TypeUInt64()> [32+umagic(32,c).s-1]))) // result: (Trunc64to32 (Rsh64Ux64 <config.fe.TypeUInt64()> (Avg64u (Lsh64x64 <config.fe.TypeUInt64()> (ZeroExt32to64 x) (Const64 <config.fe.TypeUInt64()> [32])) (Mul64 <config.fe.TypeUInt64()> (Const64 <config.fe.TypeUInt32()> [int64(umagic(32,c).m)]) (ZeroExt32to64 x))) (Const64 <config.fe.TypeUInt64()> [32+umagic(32,c).s-1])))
for { for {
x := v.Args[0] x := v.Args[0]
v_1 := v.Args[1] v_1 := v.Args[1]
@ -2835,7 +2835,7 @@ func rewriteValuegeneric_OpDiv32u(v *Value, config *Config) bool {
v4.AuxInt = 32 v4.AuxInt = 32
v2.AddArg(v4) v2.AddArg(v4)
v1.AddArg(v2) v1.AddArg(v2)
v5 := b.NewValue0(v.Pos, OpMul64, config.fe.TypeUInt32()) v5 := b.NewValue0(v.Pos, OpMul64, config.fe.TypeUInt64())
v6 := b.NewValue0(v.Pos, OpConst64, config.fe.TypeUInt32()) v6 := b.NewValue0(v.Pos, OpConst64, config.fe.TypeUInt32())
v6.AuxInt = int64(umagic(32, c).m) v6.AuxInt = int64(umagic(32, c).m)
v5.AddArg(v6) v5.AddArg(v6)