diff options
| author | qmuntal <quimmuntal@gmail.com> | 2022-12-23 13:22:00 +0100 |
|---|---|---|
| committer | Quim Muntal <quimmuntal@gmail.com> | 2023-01-24 19:29:51 +0000 |
| commit | 083d94f69c35b2244ea43738c1d28aa5d9e6d567 (patch) | |
| tree | cbcc4cf9b4eb2a6f7e351423c9e2bcb61135de37 /src/runtime/sys_windows_amd64.s | |
| parent | 27500d88f082d2789f90a644962684b4118c4d44 (diff) | |
| download | go-083d94f69c35b2244ea43738c1d28aa5d9e6d567.tar.xz | |
runtime: use explicit NOFRAME on windows/amd64
This CL marks non-leaf nosplit assembly functions as NOFRAME to avoid
relying on the implicit amd64 NOFRAME heuristic, where NOSPLIT functions
without stack were also marked as NOFRAME.
Updates #57302
Updates #40044
Change-Id: Ia4d26f8420dcf2b54528969ffbf40a73f1315d61
Reviewed-on: https://go-review.googlesource.com/c/go/+/459395
Reviewed-by: Cherry Mui <cherryyz@google.com>
Run-TryBot: Quim Muntal <quimmuntal@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Diffstat (limited to 'src/runtime/sys_windows_amd64.s')
| -rw-r--r-- | src/runtime/sys_windows_amd64.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime/sys_windows_amd64.s b/src/runtime/sys_windows_amd64.s index 7cab08efa6..5734a3a555 100644 --- a/src/runtime/sys_windows_amd64.s +++ b/src/runtime/sys_windows_amd64.s @@ -142,7 +142,7 @@ TEXT runtime·lastcontinuetramp(SB),NOSPLIT|NOFRAME,$0-0 GLOBL runtime·cbctxts(SB), NOPTR, $8 -TEXT runtime·callbackasm1(SB),NOSPLIT,$0 +TEXT runtime·callbackasm1(SB),NOSPLIT|NOFRAME,$0 // Construct args vector for cgocallback(). // By windows/amd64 calling convention first 4 args are in CX, DX, R8, R9 // args from the 5th on are on the stack. @@ -194,7 +194,7 @@ TEXT runtime·callbackasm1(SB),NOSPLIT,$0 RET // uint32 tstart_stdcall(M *newm); -TEXT runtime·tstart_stdcall(SB),NOSPLIT,$0 +TEXT runtime·tstart_stdcall(SB),NOSPLIT|NOFRAME,$0 // Switch from the host ABI to the Go ABI. PUSH_REGS_HOST_TO_ABI0() @@ -308,7 +308,7 @@ useQPC: // func osSetupTLS(mp *m) // Setup TLS. for use by needm on Windows. -TEXT runtime·osSetupTLS(SB),NOSPLIT,$0-8 +TEXT runtime·osSetupTLS(SB),NOSPLIT|NOFRAME,$0-8 MOVQ mp+0(FP), AX LEAQ m_tls(AX), DI CALL runtime·settls(SB) |