diff options
| author | Austin Clements <austin@google.com> | 2015-06-03 14:59:27 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2015-06-06 00:07:23 +0000 |
| commit | 2774b37306616380c00a4fde7f46bde1a8668ece (patch) | |
| tree | 592b909c5f2830e705e6c1d6d5e366b19a13dc34 /src/sync | |
| parent | 11b992818549aa169c96363c9242fe66b4073d34 (diff) | |
| download | go-2774b37306616380c00a4fde7f46bde1a8668ece.tar.xz | |
all: use RET instead of RETURN on ppc64
All of the architectures except ppc64 have only "RET" for the return
mnemonic. ppc64 used to have only "RETURN", but commit cf06ea6
introduced RET as a synonym for RETURN to make ppc64 consistent with
the other architectures. However, that commit was never followed up to
make the code itself consistent by eliminating uses of RETURN.
This commit replaces all uses of RETURN in the ppc64 assembly with
RET.
This was done with
sed -i 's/\<RETURN\>/RET/' **/*_ppc64x.s
plus one manual change to syscall/asm.s.
Change-Id: I3f6c8d2be157df8841d48de988ee43f3e3087995
Reviewed-on: https://go-review.googlesource.com/10672
Reviewed-by: Rob Pike <r@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Minux Ma <minux@golang.org>
Diffstat (limited to 'src/sync')
| -rw-r--r-- | src/sync/atomic/asm_ppc64x.s | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/sync/atomic/asm_ppc64x.s b/src/sync/atomic/asm_ppc64x.s index 00e1afb78f..d3e49aefb4 100644 --- a/src/sync/atomic/asm_ppc64x.s +++ b/src/sync/atomic/asm_ppc64x.s @@ -19,7 +19,7 @@ TEXT ·SwapUint32(SB),NOSPLIT,$0-20 SYNC ISYNC MOVW R5, old+16(FP) - RETURN + RET TEXT ·SwapInt64(SB),NOSPLIT,$0-24 BR ·SwapUint64(SB) @@ -34,7 +34,7 @@ TEXT ·SwapUint64(SB),NOSPLIT,$0-24 SYNC ISYNC MOVD R5, old+16(FP) - RETURN + RET TEXT ·SwapUintptr(SB),NOSPLIT,$0-24 BR ·SwapUint64(SB) @@ -56,9 +56,9 @@ TEXT ·CompareAndSwapUint32(SB),NOSPLIT,$0-17 ISYNC MOVD $1, R3 MOVB R3, swapped+16(FP) - RETURN + RET MOVB R0, swapped+16(FP) - RETURN + RET TEXT ·CompareAndSwapUintptr(SB),NOSPLIT,$0-25 BR ·CompareAndSwapUint64(SB) @@ -80,9 +80,9 @@ TEXT ·CompareAndSwapUint64(SB),NOSPLIT,$0-25 ISYNC MOVD $1, R3 MOVB R3, swapped+24(FP) - RETURN + RET MOVB R0, swapped+24(FP) - RETURN + RET TEXT ·AddInt32(SB),NOSPLIT,$0-20 BR ·AddUint32(SB) @@ -98,7 +98,7 @@ TEXT ·AddUint32(SB),NOSPLIT,$0-20 SYNC ISYNC MOVW R5, ret+16(FP) - RETURN + RET TEXT ·AddUintptr(SB),NOSPLIT,$0-24 BR ·AddUint64(SB) @@ -117,7 +117,7 @@ TEXT ·AddUint64(SB),NOSPLIT,$0-24 SYNC ISYNC MOVD R5, ret+16(FP) - RETURN + RET TEXT ·LoadInt32(SB),NOSPLIT,$0-12 BR ·LoadUint32(SB) @@ -130,7 +130,7 @@ TEXT ·LoadUint32(SB),NOSPLIT,$0-12 BC 4, 30, 1(PC) // bne- cr7,0x4 ISYNC MOVW R3, val+8(FP) - RETURN + RET TEXT ·LoadInt64(SB),NOSPLIT,$0-16 BR ·LoadUint64(SB) @@ -143,7 +143,7 @@ TEXT ·LoadUint64(SB),NOSPLIT,$0-16 BC 4, 30, 1(PC) // bne- cr7,0x4 ISYNC MOVD R3, val+8(FP) - RETURN + RET TEXT ·LoadUintptr(SB),NOSPLIT,$0-16 BR ·LoadPointer(SB) @@ -159,7 +159,7 @@ TEXT ·StoreUint32(SB),NOSPLIT,$0-12 MOVW val+8(FP), R4 SYNC MOVW R4, 0(R3) - RETURN + RET TEXT ·StoreInt64(SB),NOSPLIT,$0-16 BR ·StoreUint64(SB) @@ -169,7 +169,7 @@ TEXT ·StoreUint64(SB),NOSPLIT,$0-16 MOVD val+8(FP), R4 SYNC MOVD R4, 0(R3) - RETURN + RET TEXT ·StoreUintptr(SB),NOSPLIT,$0-16 BR ·StoreUint64(SB) |