]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/compile: for arm, zero unaligned memory 1 byte at a time
authorKeith Randall <khr@golang.org>
Tue, 31 May 2016 21:55:12 +0000 (14:55 -0700)
committerKeith Randall <khr@golang.org>
Wed, 1 Jun 2016 14:14:13 +0000 (14:14 +0000)
If memory might be unaligned, zero it one byte at a time
instead of 4 bytes at a time.

Fixes #15902

Change-Id: I4eff0840e042e2f137c1a4028f08793eb7dfd703
Reviewed-on: https://go-review.googlesource.com/23587
Run-TryBot: Keith Randall <khr@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Minux Ma <minux@golang.org>
src/cmd/compile/internal/arm/ggen.go
test/fixedbugs/issue15902.go [new file with mode: 0644]

index d241357d62c0c14f219cf6884b19066ddc86ab70..4a45e589ebd81bc38ba3911767df13647c07d84d 100644 (file)
@@ -341,6 +341,11 @@ func clearfat(nl *gc.Node) {
        c := w % 4 // bytes
        q := w / 4 // quads
 
+       if nl.Type.Align < 4 {
+               q = 0
+               c = w
+       }
+
        var r0 gc.Node
        r0.Op = gc.OREGISTER
 
@@ -395,6 +400,27 @@ func clearfat(nl *gc.Node) {
                }
        }
 
+       if c > 4 {
+               // Loop to zero unaligned memory.
+               var end gc.Node
+               gc.Regalloc(&end, gc.Types[gc.Tptr], nil)
+               p := gins(arm.AMOVW, &dst, &end)
+               p.From.Type = obj.TYPE_ADDR
+               p.From.Offset = int64(c)
+
+               p = gins(arm.AMOVB, &nz, &dst)
+               p.To.Type = obj.TYPE_MEM
+               p.To.Offset = 1
+               p.Scond |= arm.C_PBIT
+               pl := p
+
+               p = gins(arm.ACMP, &dst, nil)
+               raddr(&end, p)
+               gc.Patch(gc.Gbranch(arm.ABNE, nil, 0), pl)
+
+               gc.Regfree(&end)
+               c = 0
+       }
        var p *obj.Prog
        for c > 0 {
                p = gins(arm.AMOVB, &nz, &dst)
diff --git a/test/fixedbugs/issue15902.go b/test/fixedbugs/issue15902.go
new file mode 100644 (file)
index 0000000..9511a22
--- /dev/null
@@ -0,0 +1,27 @@
+// run
+
+// Copyright 2016 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// This test makes sure we don't use 4-byte unaligned writes
+// to zero memory on architectures that don't support them.
+
+package main
+
+type T struct {
+       a byte
+       b [10]byte
+}
+
+//go:noinline
+func f(t *T) {
+       // t will be aligned, so &t.b won't be.
+       t.b = [10]byte{}
+}
+
+var t T
+
+func main() {
+       f(&t)
+}