diff options
| author | Russ Cox <rsc@golang.org> | 2011-06-02 13:13:51 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2011-06-02 13:13:51 -0400 |
| commit | 69cb8fef43aba1d133d093c4617c5711c1b5a20b (patch) | |
| tree | 686bec8e28d1f2892aeec60b7303b989c6fc8cd0 | |
| parent | f3c351982fc2a9940f7ec831db48569b56f0a035 (diff) | |
| download | go-69cb8fef43aba1d133d093c4617c5711c1b5a20b.tar.gz go-69cb8fef43aba1d133d093c4617c5711c1b5a20b.zip | |
sync/atomic: fix check64
The LDREXD and STREXD instructions require
aligned addresses, and the ARM stack is not
guaranteed to be aligned during the check.
This may cause other problems later (on the ARM
not all 64-bit pointers may be 64-bit aligned)
but at least the check is correct now.
R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/4564053
| -rw-r--r-- | src/pkg/sync/atomic/asm_arm.s | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/pkg/sync/atomic/asm_arm.s b/src/pkg/sync/atomic/asm_arm.s index 3363bbcf1c..448a98a010 100644 --- a/src/pkg/sync/atomic/asm_arm.s +++ b/src/pkg/sync/atomic/asm_arm.s @@ -87,11 +87,14 @@ add64loop: // which will make uses of the 64-bit atomic operations loop forever. // If things are working, set okLDREXD to avoid future checks. // https://bugs.launchpad.net/qemu/+bug/670883. -TEXT check64<>(SB),7,$8 +TEXT check64<>(SB),7,$16 MOVW $10, R1 + // 8-aligned stack address scratch space. + MOVW $8(SP), R3 + AND $~7, R3 loop: - LDREXD (SP), R2 - STREXD R2, (SP), R0 + LDREXD (R3), R2 + STREXD R2, (R3), R0 CMP $0, R0 BEQ ok SUB $1, R1 |