diff options
| author | Austin Clements <austin@google.com> | 2018-01-25 12:15:23 -0500 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2018-02-12 21:41:30 +0000 |
| commit | a046caa1e8c6cb2e21f438c672c0c1a96eebfff6 (patch) | |
| tree | af71940bdc6adea326399597f1d4a4ce9ca2e54a /src/sync | |
| parent | 39f42c59e65963343d11f301a3d5838c0bfb1002 (diff) | |
| download | go-git-a046caa1e8c6cb2e21f438c672c0c1a96eebfff6.tar.gz | |
runtime, sync/atomic: use NOFRAME on arm
This replaces frame size -4 with the NOFRAME flag in arm assembly.
This was automated with:
sed -i -e 's/\(^TEXT.*[A-Z]\),\( *\)\$-4/\1|NOFRAME,\2$0/' $(find -name '*_arm.s')
Plus three manual comment changes found by:
grep '\$-4' $(find -name '*_arm.s')
The go binary is identical before and after this change.
Change-Id: I0310384d1a584118c41d1cd3a042bb8ea7227ef9
Reviewed-on: https://go-review.googlesource.com/92042
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Diffstat (limited to 'src/sync')
| -rw-r--r-- | src/sync/atomic/asm_arm.s | 2 | ||||
| -rw-r--r-- | src/sync/atomic/asm_darwin_arm.s | 2 | ||||
| -rw-r--r-- | src/sync/atomic/asm_freebsd_arm.s | 2 | ||||
| -rw-r--r-- | src/sync/atomic/asm_linux_arm.s | 4 | ||||
| -rw-r--r-- | src/sync/atomic/asm_nacl_arm.s | 2 | ||||
| -rw-r--r-- | src/sync/atomic/asm_netbsd_arm.s | 2 | ||||
| -rw-r--r-- | src/sync/atomic/asm_openbsd_arm.s | 2 | ||||
| -rw-r--r-- | src/sync/atomic/asm_plan9_arm.s | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/sync/atomic/asm_arm.s b/src/sync/atomic/asm_arm.s index 77b0b248bc..d5bffcb946 100644 --- a/src/sync/atomic/asm_arm.s +++ b/src/sync/atomic/asm_arm.s @@ -209,7 +209,7 @@ ok: RET // Fast, cached version of check. No frame, just MOVW CMP RET after first time. -TEXT fastCheck64<>(SB),NOSPLIT,$-4 +TEXT fastCheck64<>(SB),NOSPLIT|NOFRAME,$0 MOVW ok64<>(SB), R0 CMP $0, R0 // have we been here before? RET.NE diff --git a/src/sync/atomic/asm_darwin_arm.s b/src/sync/atomic/asm_darwin_arm.s index 226822926f..1de2988f9e 100644 --- a/src/sync/atomic/asm_darwin_arm.s +++ b/src/sync/atomic/asm_darwin_arm.s @@ -42,7 +42,7 @@ TEXT ·SwapUintptr(SB),NOSPLIT,$0 TEXT ·CompareAndSwapInt64(SB),NOSPLIT,$0 B ·CompareAndSwapUint64(SB) -TEXT ·CompareAndSwapUint64(SB),NOSPLIT,$-4 +TEXT ·CompareAndSwapUint64(SB),NOSPLIT|NOFRAME,$0 B ·armCompareAndSwapUint64(SB) TEXT ·AddInt64(SB),NOSPLIT,$0 diff --git a/src/sync/atomic/asm_freebsd_arm.s b/src/sync/atomic/asm_freebsd_arm.s index cb8c783a74..78efe971be 100644 --- a/src/sync/atomic/asm_freebsd_arm.s +++ b/src/sync/atomic/asm_freebsd_arm.s @@ -37,7 +37,7 @@ TEXT ·SwapUintptr(SB),NOSPLIT,$0 TEXT ·CompareAndSwapInt64(SB),NOSPLIT,$0 B ·CompareAndSwapUint64(SB) -TEXT ·CompareAndSwapUint64(SB),NOSPLIT,$-4 +TEXT ·CompareAndSwapUint64(SB),NOSPLIT|NOFRAME,$0 B ·armCompareAndSwapUint64(SB) TEXT ·AddInt64(SB),NOSPLIT,$0 diff --git a/src/sync/atomic/asm_linux_arm.s b/src/sync/atomic/asm_linux_arm.s index fc41968a9e..1d485f85d5 100644 --- a/src/sync/atomic/asm_linux_arm.s +++ b/src/sync/atomic/asm_linux_arm.s @@ -120,7 +120,7 @@ TEXT ·generalCAS64(SB),NOSPLIT,$0-21 GLOBL armCAS64(SB), NOPTR, $4 -TEXT setupAndCallCAS64<>(SB),NOSPLIT,$-4-21 +TEXT setupAndCallCAS64<>(SB),NOSPLIT|NOFRAME,$0-21 MOVW $0xffff0ffc, R0 // __kuser_helper_version MOVW (R0), R0 // __kuser_cmpxchg64 only present if helper version >= 5 @@ -142,7 +142,7 @@ TEXT setupAndCallCAS64<>(SB),NOSPLIT,$-4-21 TEXT ·CompareAndSwapInt64(SB),NOSPLIT,$0 B ·CompareAndSwapUint64(SB) -TEXT ·CompareAndSwapUint64(SB),NOSPLIT,$-4-21 +TEXT ·CompareAndSwapUint64(SB),NOSPLIT|NOFRAME,$0-21 MOVW armCAS64(SB), R0 CMP $0, R0 MOVW.NE R0, R15 // R15 = hardware PC diff --git a/src/sync/atomic/asm_nacl_arm.s b/src/sync/atomic/asm_nacl_arm.s index f85544c14c..509f503a4c 100644 --- a/src/sync/atomic/asm_nacl_arm.s +++ b/src/sync/atomic/asm_nacl_arm.s @@ -37,7 +37,7 @@ TEXT ·SwapUintptr(SB),NOSPLIT,$0 TEXT ·CompareAndSwapInt64(SB),NOSPLIT,$0 B ·CompareAndSwapUint64(SB) -TEXT ·CompareAndSwapUint64(SB),NOSPLIT,$-4 +TEXT ·CompareAndSwapUint64(SB),NOSPLIT|NOFRAME,$0 B ·armCompareAndSwapUint64(SB) TEXT ·AddInt64(SB),NOSPLIT,$0 diff --git a/src/sync/atomic/asm_netbsd_arm.s b/src/sync/atomic/asm_netbsd_arm.s index 9a2ab1daba..d67803119c 100644 --- a/src/sync/atomic/asm_netbsd_arm.s +++ b/src/sync/atomic/asm_netbsd_arm.s @@ -37,7 +37,7 @@ TEXT ·SwapUintptr(SB),NOSPLIT,$0 TEXT ·CompareAndSwapInt64(SB),NOSPLIT,$0 B ·CompareAndSwapUint64(SB) -TEXT ·CompareAndSwapUint64(SB),NOSPLIT,$-4 +TEXT ·CompareAndSwapUint64(SB),NOSPLIT|NOFRAME,$0 B ·armCompareAndSwapUint64(SB) TEXT ·AddInt64(SB),NOSPLIT,$0 diff --git a/src/sync/atomic/asm_openbsd_arm.s b/src/sync/atomic/asm_openbsd_arm.s index a1a062ade6..c73807fd5a 100644 --- a/src/sync/atomic/asm_openbsd_arm.s +++ b/src/sync/atomic/asm_openbsd_arm.s @@ -37,7 +37,7 @@ TEXT ·SwapUintptr(SB),NOSPLIT,$0 TEXT ·CompareAndSwapInt64(SB),NOSPLIT,$0 B ·CompareAndSwapUint64(SB) -TEXT ·CompareAndSwapUint64(SB),NOSPLIT,$-4 +TEXT ·CompareAndSwapUint64(SB),NOSPLIT|NOFRAME,$0 B ·armCompareAndSwapUint64(SB) TEXT ·AddInt64(SB),NOSPLIT,$0 diff --git a/src/sync/atomic/asm_plan9_arm.s b/src/sync/atomic/asm_plan9_arm.s index d74ff4ad53..54fdeba5d8 100644 --- a/src/sync/atomic/asm_plan9_arm.s +++ b/src/sync/atomic/asm_plan9_arm.s @@ -43,7 +43,7 @@ TEXT ·SwapUintptr(SB),NOSPLIT,$0 TEXT ·CompareAndSwapInt64(SB),NOSPLIT,$0 B ·CompareAndSwapUint64(SB) -TEXT ·CompareAndSwapUint64(SB),NOSPLIT,$-4 +TEXT ·CompareAndSwapUint64(SB),NOSPLIT|NOFRAME,$0 B ·armCompareAndSwapUint64(SB) TEXT ·AddInt64(SB),NOSPLIT,$0 |