[go] runtime: use explicit NOFRAME on windows/amd64
81 views
Skip to first unread message
Quim Muntal (Gerrit)
Dec 23, 2022, 7:28:01 AM12/23/22
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Quim Muntal has uploaded this change for review.
runtime: use explicit NOFRAME on windows/amd64
This CL marks some assembly functions as NOFRAME and avoids relying
on an implicit NOFRAME heuristic on windows/amd64, where functions
marked as NOSPLIT with a frame size of zero where also marked as NOFRAME.
This will allow, on a future CL, using frame pointers on NOSPLIT
functions without stack, necessary to correctly unwind the stack by
WinDbg and gdb.
Updates #57302
Updates #40044
Change-Id: Ia4d26f8420dcf2b54528969ffbf40a73f1315d61
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/duff_amd64.s
M src/runtime/memclr_amd64.s
M src/runtime/mkduff.go
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
11 files changed, 76 insertions(+), 53 deletions(-)
diff --git a/src/cmd/internal/obj/x86/obj6.go b/src/cmd/internal/obj/x86/obj6.go
index 85a4260..dec0ab8 100644
--- a/src/cmd/internal/obj/x86/obj6.go
+++ b/src/cmd/internal/obj/x86/obj6.go
@@ -608,13 +608,14 @@
var bpsize int
if ctxt.Arch.Family == sys.AMD64 &&
!p.From.Sym.NoFrame() && // (1) below
- !(autoffset == 0 && p.From.Sym.NoSplit()) && // (2) below
+ !(autoffset == 0 && p.From.Sym.NoSplit() && ctxt.Headtype != objabi.Hwindows) && // (2) below
!(autoffset == 0 && !hasCall) { // (3) below
// Make room to save a base pointer.
// There are 2 cases we must avoid:
// 1) If noframe is set (which we do for functions which tail call).
// 2) Scary runtime internals which would be all messed up by frame pointers.
// We detect these using a heuristic: frameless nosplit functions.
+ // Windows does not use this heuristic anymore.
// TODO: Maybe someday we label them all with NOFRAME and get rid of this heuristic.
// For performance, we also want to avoid:
// 3) Frameless leaf functions
diff --git a/src/runtime/asm_amd64.s b/src/runtime/asm_amd64.s
index 13c8de4..26f1fc0 100644
--- a/src/runtime/asm_amd64.s
+++ b/src/runtime/asm_amd64.s
@@ -29,7 +29,7 @@
// c-archive) or when the shared library is loaded (for c-shared).
// We expect argc and argv to be passed in the usual C ABI registers
// DI and SI.
-TEXT _rt0_amd64_lib(SB),NOSPLIT,$0
+TEXT _rt0_amd64_lib(SB),NOSPLIT|NOFRAME,$0
// Transition from C ABI to Go ABI.
PUSH_REGS_HOST_TO_ABI0()
@@ -390,7 +390,7 @@
// No per-thread init.
RET
-TEXT runtime·mstart(SB),NOSPLIT|TOPFRAME,$0
+TEXT runtime·mstart(SB),NOSPLIT|TOPFRAME|NOFRAME,$0
CALL runtime·mstart0(SB)
RET // not reached
@@ -400,13 +400,13 @@
// func gogo(buf *gobuf)
// restore state from Gobuf; longjmp
-TEXT runtime·gogo(SB), NOSPLIT, $0-8
+TEXT runtime·gogo(SB),NOSPLIT,$0-8
MOVQ buf+0(FP), BX // gobuf
MOVQ gobuf_g(BX), DX
MOVQ 0(DX), CX // make sure g != nil
JMP gogo<>(SB)
-TEXT gogo<>(SB), NOSPLIT, $0
+TEXT gogo<>(SB),NOSPLIT,$0
get_tls(CX)
MOVQ DX, g(CX)
MOVQ DX, R14 // set the g register
@@ -425,7 +425,7 @@
// Switch to m->g0's stack, call fn(g).
// Fn must never return. It should gogo(&g->sched)
// to keep running g.
-TEXT runtime·mcall<ABIInternal>(SB), NOSPLIT, $0-8
+TEXT runtime·mcall<ABIInternal>(SB),NOSPLIT|NOFRAME,$0-8
MOVQ AX, DX // DX = fn
// save state in g->sched
@@ -459,11 +459,11 @@
// lives at the bottom of the G stack from the one that lives
// at the top of the system stack because the one at the top of
// the system stack terminates the stack walk (see topofstack()).
-TEXT runtime·systemstack_switch(SB), NOSPLIT, $0-0
+TEXT runtime·systemstack_switch(SB),NOSPLIT,$0-0
RET
// func systemstack(fn func())
-TEXT runtime·systemstack(SB), NOSPLIT, $0-8
+TEXT runtime·systemstack(SB),NOSPLIT|NOFRAME,$0-8
MOVQ fn+0(FP), DI // DI = fn
get_tls(CX)
MOVQ g(CX), AX // AX = g
@@ -530,7 +530,7 @@
// the top of a stack (for example, morestack calling newstack
// calling the scheduler calling newm calling gc), so we must
// record an argument size. For that purpose, it has no arguments.
-TEXT runtime·morestack(SB),NOSPLIT,$0-0
+TEXT runtime·morestack(SB),NOSPLIT|NOFRAME,$0-0
// Cannot grow scheduler stack (m->g0).
get_tls(CX)
MOVQ g(CX), BX
@@ -649,7 +649,7 @@
JMP AX
// Note: can't just "JMP NAME(SB)" - bad inlining results.
-TEXT ·reflectcall(SB), NOSPLIT, $0-48
+TEXT ·reflectcall(SB),NOSPLIT,$0-48
MOVLQZX frameSize+32(FP), CX
DISPATCH(runtime·call16, 16)
DISPATCH(runtime·call32, 32)
@@ -772,7 +772,7 @@
// Must only be called from functions with no locals ($0)
// or else unwinding from systemstack_switch is incorrect.
// Smashes R9.
-TEXT gosave_systemstack_switch<>(SB),NOSPLIT,$0
+TEXT gosave_systemstack_switch<>(SB),NOSPLIT|NOFRAME,$0
MOVQ $runtime·systemstack_switch(SB), R9
MOVQ R9, (g_sched+gobuf_pc)(R14)
LEAQ 8(SP), R9
@@ -789,7 +789,7 @@
// func asmcgocall_no_g(fn, arg unsafe.Pointer)
// Call fn(arg) aligned appropriately for the gcc ABI.
// Called on a system stack, and there may be no g yet (during needm).
-TEXT ·asmcgocall_no_g(SB),NOSPLIT,$0-16
+TEXT ·asmcgocall_no_g(SB),NOSPLIT|NOFRAME,$0-16
MOVQ fn+0(FP), AX
MOVQ arg+8(FP), BX
MOVQ SP, DX
@@ -807,7 +807,7 @@
// Call fn(arg) on the scheduler stack,
// aligned appropriately for the gcc ABI.
// See cgocall.go for more details.
-TEXT ·asmcgocall(SB),NOSPLIT,$0-20
+TEXT ·asmcgocall(SB),NOSPLIT|NOFRAME,$0-20
MOVQ fn+0(FP), AX
MOVQ arg+8(FP), BX
@@ -1044,7 +1044,7 @@
// func setg(gg *g)
// set g. for use by needm.
-TEXT runtime·setg(SB), NOSPLIT, $0-8
+TEXT runtime·setg(SB),NOSPLIT,$0-8
MOVQ gg+0(FP), BX
get_tls(CX)
MOVQ BX, g(CX)
@@ -1063,7 +1063,7 @@
JMP loop
// check that SP is in range [g->stack.lo, g->stack.hi)
-TEXT runtime·stackcheck(SB), NOSPLIT, $0-0
+TEXT runtime·stackcheck(SB),NOSPLIT|NOFRAME,$0-0
get_tls(CX)
MOVQ g(CX), AX
CMPQ (g_stack+stack_hi)(AX), SP
@@ -1577,7 +1577,7 @@
DATA shifts<>+0xf8(SB)/8, $0xff0f0e0d0c0b0a09
GLOBL shifts<>(SB),RODATA,$256
-TEXT runtime·return0(SB), NOSPLIT, $0
+TEXT runtime·return0(SB),NOSPLIT,$0
MOVL $0, AX
RET
@@ -1594,7 +1594,7 @@
// The top-most function running on a goroutine
// returns to goexit+PCQuantum.
-TEXT runtime·goexit(SB),NOSPLIT|TOPFRAME,$0-0
+TEXT runtime·goexit(SB),NOSPLIT|TOPFRAME|NOFRAME,$0-0
BYTE $0x90 // NOP
CALL runtime·goexit1(SB) // does not return
// traceback from goexit1 must hit code range of goexit
@@ -1711,7 +1711,7 @@
// gcWriteBarrierCX is gcWriteBarrier, but with args in DI and CX.
// Defined as ABIInternal since it does not use the stable Go ABI.
-TEXT runtime·gcWriteBarrierCX<ABIInternal>(SB),NOSPLIT,$0
+TEXT runtime·gcWriteBarrierCX<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
XCHGQ CX, AX
CALL runtime·gcWriteBarrier<ABIInternal>(SB)
XCHGQ CX, AX
@@ -1719,7 +1719,7 @@
// gcWriteBarrierDX is gcWriteBarrier, but with args in DI and DX.
// Defined as ABIInternal since it does not use the stable Go ABI.
-TEXT runtime·gcWriteBarrierDX<ABIInternal>(SB),NOSPLIT,$0
+TEXT runtime·gcWriteBarrierDX<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
XCHGQ DX, AX
CALL runtime·gcWriteBarrier<ABIInternal>(SB)
XCHGQ DX, AX
@@ -1727,7 +1727,7 @@
// gcWriteBarrierBX is gcWriteBarrier, but with args in DI and BX.
// Defined as ABIInternal since it does not use the stable Go ABI.
-TEXT runtime·gcWriteBarrierBX<ABIInternal>(SB),NOSPLIT,$0
+TEXT runtime·gcWriteBarrierBX<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
XCHGQ BX, AX
CALL runtime·gcWriteBarrier<ABIInternal>(SB)
XCHGQ BX, AX
@@ -1735,7 +1735,7 @@
// gcWriteBarrierBP is gcWriteBarrier, but with args in DI and BP.
// Defined as ABIInternal since it does not use the stable Go ABI.
-TEXT runtime·gcWriteBarrierBP<ABIInternal>(SB),NOSPLIT,$0
+TEXT runtime·gcWriteBarrierBP<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
XCHGQ BP, AX
CALL runtime·gcWriteBarrier<ABIInternal>(SB)
XCHGQ BP, AX
@@ -1743,7 +1743,7 @@
// gcWriteBarrierSI is gcWriteBarrier, but with args in DI and SI.
// Defined as ABIInternal since it does not use the stable Go ABI.
-TEXT runtime·gcWriteBarrierSI<ABIInternal>(SB),NOSPLIT,$0
+TEXT runtime·gcWriteBarrierSI<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
XCHGQ SI, AX
CALL runtime·gcWriteBarrier<ABIInternal>(SB)
XCHGQ SI, AX
@@ -1751,7 +1751,7 @@
// gcWriteBarrierR8 is gcWriteBarrier, but with args in DI and R8.
// Defined as ABIInternal since it does not use the stable Go ABI.
-TEXT runtime·gcWriteBarrierR8<ABIInternal>(SB),NOSPLIT,$0
+TEXT runtime·gcWriteBarrierR8<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
XCHGQ R8, AX
CALL runtime·gcWriteBarrier<ABIInternal>(SB)
XCHGQ R8, AX
@@ -1759,7 +1759,7 @@
// gcWriteBarrierR9 is gcWriteBarrier, but with args in DI and R9.
// Defined as ABIInternal since it does not use the stable Go ABI.
-TEXT runtime·gcWriteBarrierR9<ABIInternal>(SB),NOSPLIT,$0
+TEXT runtime·gcWriteBarrierR9<ABIInternal>(SB),NOSPLIT|NOFRAME,$0
XCHGQ R9, AX
CALL runtime·gcWriteBarrier<ABIInternal>(SB)
XCHGQ R9, AX
@@ -2048,19 +2048,19 @@
BYTE $0x04|((reg&7)<<3); BYTE $0x24; \
/* RET */ BYTE $0xC3
-TEXT runtime·retpolineAX(SB),NOSPLIT,$0; RETPOLINE(0)
-TEXT runtime·retpolineCX(SB),NOSPLIT,$0; RETPOLINE(1)
-TEXT runtime·retpolineDX(SB),NOSPLIT,$0; RETPOLINE(2)
-TEXT runtime·retpolineBX(SB),NOSPLIT,$0; RETPOLINE(3)
+TEXT runtime·retpolineAX(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(0)
+TEXT runtime·retpolineCX(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(1)
+TEXT runtime·retpolineDX(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(2)
+TEXT runtime·retpolineBX(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(3)
/* SP is 4, can't happen / magic encodings */
-TEXT runtime·retpolineBP(SB),NOSPLIT,$0; RETPOLINE(5)
-TEXT runtime·retpolineSI(SB),NOSPLIT,$0; RETPOLINE(6)
-TEXT runtime·retpolineDI(SB),NOSPLIT,$0; RETPOLINE(7)
-TEXT runtime·retpolineR8(SB),NOSPLIT,$0; RETPOLINE(8)
-TEXT runtime·retpolineR9(SB),NOSPLIT,$0; RETPOLINE(9)
-TEXT runtime·retpolineR10(SB),NOSPLIT,$0; RETPOLINE(10)
-TEXT runtime·retpolineR11(SB),NOSPLIT,$0; RETPOLINE(11)
-TEXT runtime·retpolineR12(SB),NOSPLIT,$0; RETPOLINE(12)
-TEXT runtime·retpolineR13(SB),NOSPLIT,$0; RETPOLINE(13)
-TEXT runtime·retpolineR14(SB),NOSPLIT,$0; RETPOLINE(14)
-TEXT runtime·retpolineR15(SB),NOSPLIT,$0; RETPOLINE(15)
+TEXT runtime·retpolineBP(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(5)
+TEXT runtime·retpolineSI(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(6)
+TEXT runtime·retpolineDI(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(7)
+TEXT runtime·retpolineR8(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(8)
+TEXT runtime·retpolineR9(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(9)
+TEXT runtime·retpolineR10(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(10)
+TEXT runtime·retpolineR11(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(11)
+TEXT runtime·retpolineR12(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(12)
+TEXT runtime·retpolineR13(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(13)
+TEXT runtime·retpolineR14(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(14)
+TEXT runtime·retpolineR15(SB),NOSPLIT|NOFRAME,$0; RETPOLINE(15)
diff --git a/src/runtime/cgo/asm_amd64.s b/src/runtime/cgo/asm_amd64.s
index 386299c..e223a6c 100644
--- a/src/runtime/cgo/asm_amd64.s
+++ b/src/runtime/cgo/asm_amd64.s
@@ -10,7 +10,7 @@
// Saves C callee-saved registers and calls cgocallback with three arguments.
// fn is the PC of a func(a unsafe.Pointer) function.
// This signature is known to SWIG, so we can't change it.
-TEXT crosscall2(SB),NOSPLIT,$0-0
+TEXT crosscall2(SB),NOSPLIT|NOFRAME,$0-0
PUSH_REGS_HOST_TO_ABI0()
// Make room for arguments to cgocallback.
diff --git a/src/runtime/duff_amd64.s b/src/runtime/duff_amd64.s
index df010f5..69e9980 100644
--- a/src/runtime/duff_amd64.s
+++ b/src/runtime/duff_amd64.s
@@ -4,7 +4,7 @@
#include "textflag.h"
-TEXT runtime·duffzero<ABIInternal>(SB), NOSPLIT, $0-0
+TEXT runtime·duffzero<ABIInternal>(SB), NOSPLIT|NOFRAME, $0-0
MOVUPS X15,(DI)
MOVUPS X15,16(DI)
MOVUPS X15,32(DI)
@@ -103,7 +103,7 @@
RET
-TEXT runtime·duffcopy<ABIInternal>(SB), NOSPLIT, $0-0
+TEXT runtime·duffcopy<ABIInternal>(SB), NOSPLIT|NOFRAME, $0-0
MOVUPS (SI), X0
ADDQ $16, SI
MOVUPS X0, (DI)
diff --git a/src/runtime/memclr_amd64.s b/src/runtime/memclr_amd64.s
index 19bfa6f..e78d5c3 100644
--- a/src/runtime/memclr_amd64.s
+++ b/src/runtime/memclr_amd64.s
@@ -12,7 +12,7 @@
// func memclrNoHeapPointers(ptr unsafe.Pointer, n uintptr)
// ABIInternal for performance.
-TEXT runtime·memclrNoHeapPointers<ABIInternal>(SB), NOSPLIT, $0-16
+TEXT runtime·memclrNoHeapPointers<ABIInternal>(SB),NOSPLIT|NOFRAME,$0-16
// AX = ptr
// BX = n
MOVQ AX, DI // DI = ptr
diff --git a/src/runtime/mkduff.go b/src/runtime/mkduff.go
index 6b42b85..cc58558 100644
--- a/src/runtime/mkduff.go
+++ b/src/runtime/mkduff.go
@@ -66,7 +66,7 @@
// X15: zero
// DI: ptr to memory to be zeroed
// DI is updated as a side effect.
- fmt.Fprintln(w, "TEXT runtime·duffzero<ABIInternal>(SB), NOSPLIT, $0-0")
+ fmt.Fprintln(w, "TEXT runtime·duffzero<ABIInternal>(SB), NOSPLIT|NOFRAME, $0-0")
for i := 0; i < 16; i++ {
fmt.Fprintln(w, "\tMOVUPS\tX15,(DI)")
fmt.Fprintln(w, "\tMOVUPS\tX15,16(DI)")
@@ -85,7 +85,7 @@
//
// This is equivalent to a sequence of MOVSQ but
// for some reason that is 3.5x slower than this code.
- fmt.Fprintln(w, "TEXT runtime·duffcopy<ABIInternal>(SB), NOSPLIT, $0-0")
+ fmt.Fprintln(w, "TEXT runtime·duffcopy<ABIInternal>(SB), NOSPLIT|NOFRAME, $0-0")
for i := 0; i < 64; i++ {
fmt.Fprintln(w, "\tMOVUPS\t(SI), X0")
fmt.Fprintln(w, "\tADDQ\t$16, SI")
diff --git a/src/runtime/race_amd64.s b/src/runtime/race_amd64.s
index c679a87..0566cbe 100644
--- a/src/runtime/race_amd64.s
+++ b/src/runtime/race_amd64.s
@@ -383,7 +383,7 @@
JMP racecall<>(SB)
// Switches SP to g0 stack and calls (AX). Arguments already set.
-TEXT racecall<>(SB), NOSPLIT, $0-0
+TEXT racecall<>(SB), NOSPLIT|NOFRAME, $0-0
MOVQ g_m(R14), R13
// Switch to g0 stack.
MOVQ SP, R12 // callee-saved, preserved across the CALL
@@ -405,7 +405,7 @@
// The overall effect of Go->C->Go call chain is similar to that of mcall.
// RARG0 contains command code. RARG1 contains command-specific context.
// See racecallback for command codes.
-TEXT runtime·racecallbackthunk(SB), NOSPLIT, $0-0
+TEXT runtime·racecallbackthunk(SB), NOSPLIT|NOFRAME, $0-0
// Handle command raceGetProcCmd (0) here.
// First, code below assumes that we are on curg, while raceGetProcCmd
// can be executed on g0. Second, it is called frequently, so will
diff --git a/src/runtime/rt0_windows_amd64.s b/src/runtime/rt0_windows_amd64.s
index e60bf4c..9c60337 100644
--- a/src/runtime/rt0_windows_amd64.s
+++ b/src/runtime/rt0_windows_amd64.s
@@ -16,7 +16,7 @@
// phase.
// Leave space for four pointers on the stack as required
// by the Windows amd64 calling convention.
-TEXT _rt0_amd64_windows_lib(SB),NOSPLIT,$0x20
+TEXT _rt0_amd64_windows_lib(SB),NOSPLIT|NOFRAME,$0x20
// Create a new thread to do the runtime initialization and return.
MOVQ _cgo_sys_thread_create(SB), AX
MOVQ $_rt0_amd64_windows_lib_go(SB), CX
diff --git a/src/runtime/sys_windows_amd64.s b/src/runtime/sys_windows_amd64.s
index 777726f..ed995aa 100644
--- a/src/runtime/sys_windows_amd64.s
+++ b/src/runtime/sys_windows_amd64.s
@@ -237,7 +237,7 @@
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.
@@ -289,7 +289,7 @@
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()
@@ -403,7 +403,7 @@
// 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)
diff --git a/src/runtime/wincallback.go b/src/runtime/wincallback.go
index 9ec2027..c716f5a 100644
--- a/src/runtime/wincallback.go
+++ b/src/runtime/wincallback.go
@@ -30,8 +30,9 @@
// appropriately so different callbacks start with different
// CALL instruction in runtime·callbackasm. This determines
// which Go callback function is executed later on.
+#include "textflag.h"
-TEXT runtime·callbackasm(SB),7,$0
+TEXT runtime·callbackasm(SB),NOSPLIT|NOFRAME|DUPOK,$0
`)
for i := 0; i < maxCallback; i++ {
buf.WriteString("\tCALL\truntime·callbackasm1(SB)\n")
diff --git a/src/runtime/zcallback_windows.s b/src/runtime/zcallback_windows.s
index bd23d71..feb4769 100644
--- a/src/runtime/zcallback_windows.s
+++ b/src/runtime/zcallback_windows.s
@@ -9,8 +9,9 @@
// appropriately so different callbacks start with different
// CALL instruction in runtime·callbackasm. This determines
// which Go callback function is executed later on.
+#include "textflag.h"
-TEXT runtime·callbackasm(SB),7,$0
+TEXT runtime·callbackasm(SB),NOSPLIT|NOFRAME|DUPOK,$0
CALL runtime·callbackasm1(SB)
CALL runtime·callbackasm1(SB)
CALL runtime·callbackasm1(SB)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Dec 23, 2022, 7:28:09 AM12/23/22
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Patch set 1:Run-TryBot +1
Quim Muntal (Gerrit)
Dec 23, 2022, 9:04:46 AM12/23/22
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #2 to this change.
runtime: use explicit NOFRAME on windows/amd64
This CL marks some assembly functions as NOFRAME and avoids relying
on an implicit NOFRAME heuristic on windows/amd64, where NOSPLIT
functions without stack were also marked as NOFRAME.
This will allow, on a future CL, using frame pointers on NOSPLIT
functions without stack, necessary to correctly unwind the stack by
WinDbg and gdb.
Updates #57302
Updates #40044
Change-Id: Ia4d26f8420dcf2b54528969ffbf40a73f1315d61
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/duff_amd64.s
M src/runtime/memclr_amd64.s
M src/runtime/mkduff.go
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
11 files changed, 76 insertions(+), 53 deletions(-)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Dec 23, 2022, 9:06:08 AM12/23/22
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #3 to this change.
runtime: use explicit NOFRAME on windows/amd64
This CL marks some assembly functions as NOFRAME to avoid relying
on the implicit amd64 NOFRAME heuristic, where NOSPLIT functions
Quim Muntal (Gerrit)
Dec 23, 2022, 9:23:56 AM12/23/22
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #4 to this change.
The following approvals got outdated and were removed: Run-TryBot+1 by Quim Muntal, TryBot-Result-1 by Gopher Robot
runtime: use explicit NOFRAME on windows/amd64
This CL marks some assembly functions as NOFRAME to avoid relying
on the implicit amd64 NOFRAME heuristic, where NOSPLIT functions
without stack were also marked as NOFRAME.
It will allow, on a future CL, using frame pointers on NOSPLIT
functions without stack, necessary to correctly unwind the stack by
WinDbg and gdb.
Updates #57302
Updates #40044
Change-Id: Ia4d26f8420dcf2b54528969ffbf40a73f1315d61
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/duff_amd64.s
M src/runtime/memclr_amd64.s
M src/runtime/mkduff.go
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
11 files changed, 88 insertions(+), 65 deletions(-)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Dec 23, 2022, 9:24:04 AM12/23/22
to goph...@pubsubhelper.golang.org, Gopher Robot, Ian Lance Taylor, Keith Randall, Michael Knyszek, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek.
Patch set 4:Run-TryBot +1
Quim Muntal (Gerrit)
Dec 24, 2022, 12:44:36 PM12/24/22
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #5 to this change.
The following approvals got outdated and were removed: Run-TryBot+1 by Quim Muntal, TryBot-Result+1 by Gopher Robot
runtime: use explicit NOFRAME on windows/amd64
This CL marks some assembly functions as NOFRAME to avoid relying
on the implicit amd64 NOFRAME heuristic, where NOSPLIT functions
without stack were also marked as NOFRAME.
It will allow, on a future CL, using frame pointers on NOSPLIT
functions without stack, necessary to correctly unwind the stack by
WinDbg and gdb.
Updates #57302
Updates #40044
Change-Id: Ia4d26f8420dcf2b54528969ffbf40a73f1315d61
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/duff_amd64.s
M src/runtime/memclr_amd64.s
M src/runtime/memmove_amd64.s
M src/runtime/mkduff.go
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
12 files changed, 89 insertions(+), 66 deletions(-)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Dec 24, 2022, 12:45:07 PM12/24/22
to goph...@pubsubhelper.golang.org, Gopher Robot, Ian Lance Taylor, Keith Randall, Michael Knyszek, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek.
Patch set 5:Run-TryBot +1
1 comment:
Patchset:
TRY=windows-amd64-longtest
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 2, 2023, 10:16:48 AM1/2/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Cherry Mui, Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #7 to this change.
runtime: use explicit NOFRAME on windows/amd64
This CL marks some assembly functions as NOFRAME to avoid relying
on the implicit amd64 NOFRAME heuristic, where NOSPLIT functions
without stack were also marked as NOFRAME.
This will alow to use frame pointers on NOSPLIT functions without stack,
necessary to correctly unwind the stack on WinDbg and gdb.
Updates #57302
Updates #40044
Change-Id: Ia4d26f8420dcf2b54528969ffbf40a73f1315d61
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/duff_amd64.s
M src/runtime/memclr_amd64.s
M src/runtime/memmove_amd64.s
M src/runtime/mkduff.go
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
12 files changed, 87 insertions(+), 65 deletions(-)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 2, 2023, 10:16:57 AM1/2/23
to goph...@pubsubhelper.golang.org, Cherry Mui, Gopher Robot, Ian Lance Taylor, Keith Randall, Michael Knyszek, golang-co...@googlegroups.com
Attention is currently required from: Cherry Mui, Ian Lance Taylor, Keith Randall, Michael Knyszek.
Patch set 7:Run-TryBot +1
Quim Muntal (Gerrit)
Jan 4, 2023, 8:22:33 AM1/4/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Cherry Mui, Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #8 to this change.
The following approvals got outdated and were removed: Run-TryBot+1 by Quim Muntal, TryBot-Result-1 by Gopher Robot
runtime: use explicit NOFRAME on windows/amd64
This CL marks some assembly functions as NOFRAME to avoid relying
on the implicit amd64 NOFRAME heuristic, where NOSPLIT functions
without stack were also marked as NOFRAME.
This will alow to use frame pointers on NOSPLIT functions without stack,
necessary to correctly unwind the stack on WinDbg and gdb.
Updates #57302
Updates #40044
Change-Id: Ia4d26f8420dcf2b54528969ffbf40a73f1315d61
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/duff_amd64.s
M src/runtime/memclr_amd64.s
M src/runtime/memmove_amd64.s
M src/runtime/mkduff.go
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
12 files changed, 88 insertions(+), 66 deletions(-)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 11, 2023, 3:29:30 AM1/11/23
to goph...@pubsubhelper.golang.org, Gopher Robot, Cherry Mui, Ian Lance Taylor, Keith Randall, Michael Knyszek, golang-co...@googlegroups.com
Attention is currently required from: Cherry Mui, Ian Lance Taylor, Keith Randall, Michael Knyszek.
Patch set 10:Run-TryBot +1
Cherry Mui (Gerrit)
Jan 13, 2023, 5:37:26 PM1/13/23
to Quim Muntal, goph...@pubsubhelper.golang.org, Gopher Robot, Ian Lance Taylor, Keith Randall, Michael Knyszek, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
6 comments:
Commit Message:
Did you mark all non-leaf nosplit functions, or select only some of the functions that you think need to be noframe?
Patch Set #10, Line 14:
correctly unwind the stack on WinDbg and gdbIf you mean stack transition, I think we still are not really sure what "correctly" means here. If you mean regular stacks, I think gdb should be able to unwind even without frame pointer?
File src/runtime/asm_amd64.s:
Patch Set #10, Line 403:
TEXT runtime·gogo(SB),NOSPLIT,$0-8Undo unrelated formatting changes. Thanks.
File src/runtime/memclr_amd64.s:
Patch Set #10, Line 15:
NOFRAMEIs this necessary? This is a frameless leaf function so it is automatically NOFRAME. Or you want to be explicit? (Also a few other functions.)
File src/runtime/wincallback.go:
Patch Set #10, Line 33:
#include "textflag.h"Maybe move this before the comment above, so it reads better.
Patch Set #10, Line 35:
DUPOKWhy this is DUPOK? I don't expect this function being defined multiple times. I see that the 7 in the old code includes the DUPOK bit. But that is probably unnecessary.
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 18, 2023, 11:36:58 AM1/18/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #11 to this change.
The following approvals got outdated and were removed: Run-TryBot+1 by Quim Muntal, TryBot-Result+1 by Gopher Robot
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
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/duff_amd64.s
M src/runtime/memclr_amd64.s
M src/runtime/memmove_amd64.s
M src/runtime/mkduff.go
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
12 files changed, 86 insertions(+), 66 deletions(-)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 18, 2023, 11:39:37 AM1/18/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #12 to this change.
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
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/duff_amd64.s
M src/runtime/memclr_amd64.s
M src/runtime/memmove_amd64.s
M src/runtime/mkduff.go
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
12 files changed, 80 insertions(+), 60 deletions(-)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 18, 2023, 11:41:30 AM1/18/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #13 to this change.
Quim Muntal (Gerrit)
Jan 18, 2023, 12:17:29 PM1/18/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #14 to this change.
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
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
8 files changed, 74 insertions(+), 54 deletions(-)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 18, 2023, 12:22:32 PM1/18/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #15 to this change.
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
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
8 files changed, 75 insertions(+), 54 deletions(-)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 18, 2023, 12:22:53 PM1/18/23
to goph...@pubsubhelper.golang.org, Gopher Robot, Cherry Mui, Ian Lance Taylor, Keith Randall, Michael Knyszek, golang-co...@googlegroups.com
Attention is currently required from: Cherry Mui, Ian Lance Taylor, Keith Randall, Michael Knyszek.
Patch set 15:Run-TryBot +1
6 comments:
Commit Message:
Did you mark all non-leaf nosplit functions, or select only some of the functions that you think nee […]
I marked all non-leaf nosplit functions with 0 stack size. I'll try to remove the NOFRAME attribute in a follow up CL.
Will update the commit description to be more precise.
Patch Set #10, Line 14:
correctly unwind the stack on WinDbg and gdb
If you mean stack transition, I think we still are not really sure what "correctly" means here. […]
I mean stack transition. I think this CL still have value even if we still don't know how stack transition unwinding should look like, as this CL does not try to remove NOFRAME attributes. I'm also open to park it until we take a decision.
File src/runtime/asm_amd64.s:
Patch Set #10, Line 403:
TEXT runtime·gogo(SB),NOSPLIT,$0-8Undo unrelated formatting changes. Thanks.
Done
File src/runtime/memclr_amd64.s:
Patch Set #10, Line 15:
NOFRAME
Is this necessary? This is a frameless leaf function so it is automatically NOFRAME. […]
I tried only adding NOFRAME to non-leaf functions. I'll do another pass to make sure that memclrNoHeapPointers and similars are not unnecessary marked as such.
File src/runtime/wincallback.go:
Patch Set #10, Line 33:
#include "textflag.h"Maybe move this before the comment above, so it reads better.
Done
Patch Set #10, Line 35:
DUPOK
Why this is DUPOK? I don't expect this function being defined multiple times. […]
Don't know why it was originally DUPOK, but I can remove it.
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Cherry Mui (Gerrit)
Jan 18, 2023, 1:05:15 PM1/18/23
to Quim Muntal, goph...@pubsubhelper.golang.org, Gopher Robot, Ian Lance Taylor, Keith Randall, Michael Knyszek, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
3 comments:
Commit Message:
Patch Set #10, Line 14:
correctly unwind the stack on WinDbg and gdbI mean stack transition. […]
Agreed that this CL is still a good thing to do. I was just commenting on the CL description. Looks good now. Thanks.
File src/runtime/memclr_amd64.s:
Patch Set #10, Line 15:
NOFRAME
I tried only adding NOFRAME to non-leaf functions. […]
This is a leaf function. That's what confuses me.
File src/runtime/mkduff.go:
Patch Set #10, Line 69:
NOFRAMEI think NOFRAME is actually important for duffzero and duffcopy. The compiler generates code that jumps to the middle of these functions, and it knows the offset. Extra instructions saving the frame pointer would change the offset, and won't be executed.
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 18, 2023, 1:27:54 PM1/18/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Ian Lance Taylor, Keith Randall, Michael Knyszek, Quim Muntal.
Quim Muntal uploaded patch set #16 to this change.
The following approvals got outdated and were removed: Run-TryBot+1 by Quim Muntal, TryBot-Result+1 by Gopher Robot
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
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/duff_amd64.s
M src/runtime/mkduff.go
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
10 files changed, 79 insertions(+), 58 deletions(-)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 18, 2023, 1:28:13 PM1/18/23
to goph...@pubsubhelper.golang.org, Gopher Robot, Cherry Mui, Ian Lance Taylor, Keith Randall, Michael Knyszek, golang-co...@googlegroups.com
Attention is currently required from: Cherry Mui, Ian Lance Taylor, Keith Randall, Michael Knyszek.
Patch set 16:Run-TryBot +1
1 comment:
File src/runtime/mkduff.go:
Patch Set #10, Line 69:
NOFRAME
I think NOFRAME is actually important for duffzero and duffcopy. […]
Ack
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Cherry Mui (Gerrit)
Jan 23, 2023, 8:22:31 PM1/23/23
to Quim Muntal, goph...@pubsubhelper.golang.org, Gopher Robot, Ian Lance Taylor, Michael Knyszek, golang-co...@googlegroups.com
Attention is currently required from: Michael Knyszek, Quim Muntal.
Patch set 16:Code-Review +2
Matthew Dempsky (Gerrit)
Jan 24, 2023, 1:50:54 PM1/24/23
to Quim Muntal, goph...@pubsubhelper.golang.org, Cherry Mui, Gopher Robot, Ian Lance Taylor, Michael Knyszek, golang-co...@googlegroups.com
Attention is currently required from: Michael Knyszek, Quim Muntal.
Patch set 16:Code-Review +1
Quim Muntal (Gerrit)
Jan 24, 2023, 2:30:01 PM1/24/23
to goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Matthew Dempsky, Cherry Mui, Gopher Robot, Ian Lance Taylor, Michael Knyszek, golang-co...@googlegroups.com
Quim Muntal submitted this change.
Approvals:
Matthew Dempsky: Looks good to me, but someone else must approve
Cherry Mui: Looks good to me, approved
Quim Muntal: Run TryBots
Gopher Robot: TryBots succeeded
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 <cher...@google.com>
Run-TryBot: Quim Muntal <quimm...@gmail.com>
TryBot-Result: Gopher Robot <go...@golang.org>
Reviewed-by: Matthew Dempsky <mdem...@google.com>
---
M src/cmd/internal/obj/x86/obj6.go
M src/runtime/asm_amd64.s
M src/runtime/cgo/asm_amd64.s
M src/runtime/duff_amd64.s
M src/runtime/mkduff.go
M src/runtime/race_amd64.s
M src/runtime/rt0_windows_amd64.s
M src/runtime/sys_windows_amd64.s
M src/runtime/wincallback.go
M src/runtime/zcallback_windows.s
10 files changed, 84 insertions(+), 58 deletions(-)
diff --git a/src/cmd/internal/obj/x86/obj6.go b/src/cmd/internal/obj/x86/obj6.go
index a0717626..aa4cc22 100644
--- a/src/cmd/internal/obj/x86/obj6.go
+++ b/src/cmd/internal/obj/x86/obj6.go
@@ -614,13 +614,14 @@
var bpsize int
if ctxt.Arch.Family == sys.AMD64 &&
!p.From.Sym.NoFrame() && // (1) below
- !(autoffset == 0 && p.From.Sym.NoSplit()) && // (2) below
+ !(autoffset == 0 && p.From.Sym.NoSplit() && ctxt.Headtype != objabi.Hwindows) && // (2) below
!(autoffset == 0 && !hasCall) { // (3) below
// Make room to save a base pointer.
// There are 2 cases we must avoid:
// 1) If noframe is set (which we do for functions which tail call).
// 2) Scary runtime internals which would be all messed up by frame pointers.
// We detect these using a heuristic: frameless nosplit functions.
+ // Windows does not use this heuristic anymore.
// TODO: Maybe someday we label them all with NOFRAME and get rid of this heuristic.
// For performance, we also want to avoid:
// 3) Frameless leaf functions
diff --git a/src/runtime/asm_amd64.s b/src/runtime/asm_amd64.s
index 0e72b54..6720c20 100644
--- a/src/runtime/asm_amd64.s
+++ b/src/runtime/asm_amd64.s
@@ -29,7 +29,7 @@
// c-archive) or when the shared library is loaded (for c-shared).
// We expect argc and argv to be passed in the usual C ABI registers
// DI and SI.
-TEXT _rt0_amd64_lib(SB),NOSPLIT,$0
+TEXT _rt0_amd64_lib(SB),NOSPLIT|NOFRAME,$0
// Transition from C ABI to Go ABI.
PUSH_REGS_HOST_TO_ABI0()
@@ -390,7 +390,7 @@
// No per-thread init.
RET
-TEXT runtime·mstart(SB),NOSPLIT|TOPFRAME,$0
+TEXT runtime·mstart(SB),NOSPLIT|TOPFRAME|NOFRAME,$0
CALL runtime·mstart0(SB)
RET // not reached
@@ -425,7 +425,7 @@
// Switch to m->g0's stack, call fn(g).
// Fn must never return. It should gogo(&g->sched)
// to keep running g.
-TEXT runtime·mcall<ABIInternal>(SB), NOSPLIT, $0-8
+TEXT runtime·mcall<ABIInternal>(SB), NOSPLIT|NOFRAME, $0-8
MOVQ AX, DX // DX = fn
// save state in g->sched
@@ -463,7 +463,7 @@
RET
// func systemstack(fn func())
-TEXT runtime·systemstack(SB), NOSPLIT, $0-8
+TEXT runtime·systemstack(SB), NOSPLIT|NOFRAME, $0-8
MOVQ fn+0(FP), DI // DI = fn
get_tls(CX)
MOVQ g(CX), AX // AX = g
@@ -530,7 +530,7 @@
// the top of a stack (for example, morestack calling newstack
// calling the scheduler calling newm calling gc), so we must
// record an argument size. For that purpose, it has no arguments.
-TEXT runtime·morestack(SB),NOSPLIT,$0-0
+TEXT runtime·morestack(SB),NOSPLIT|NOFRAME,$0-0
// Cannot grow scheduler stack (m->g0).
get_tls(CX)
MOVQ g(CX), BX
@@ -1063,7 +1063,7 @@
JMP loop
// check that SP is in range [g->stack.lo, g->stack.hi)
-TEXT runtime·stackcheck(SB), NOSPLIT, $0-0
+TEXT runtime·stackcheck(SB), NOSPLIT|NOFRAME, $0-0
get_tls(CX)
MOVQ g(CX), AX
CMPQ (g_stack+stack_hi)(AX), SP
diff --git a/src/runtime/mkduff.go b/src/runtime/mkduff.go
index 6b42b85..cc58558 100644
--- a/src/runtime/mkduff.go
+++ b/src/runtime/mkduff.go
@@ -66,7 +66,7 @@
// X15: zero
// DI: ptr to memory to be zeroed
// DI is updated as a side effect.
- fmt.Fprintln(w, "TEXT runtime·duffzero<ABIInternal>(SB), NOSPLIT, $0-0")
+ fmt.Fprintln(w, "TEXT runtime·duffzero<ABIInternal>(SB), NOSPLIT|NOFRAME, $0-0")
for i := 0; i < 16; i++ {
fmt.Fprintln(w, "\tMOVUPS\tX15,(DI)")
fmt.Fprintln(w, "\tMOVUPS\tX15,16(DI)")
@@ -85,7 +85,7 @@
//
// This is equivalent to a sequence of MOVSQ but
// for some reason that is 3.5x slower than this code.
- fmt.Fprintln(w, "TEXT runtime·duffcopy<ABIInternal>(SB), NOSPLIT, $0-0")
+ fmt.Fprintln(w, "TEXT runtime·duffcopy<ABIInternal>(SB), NOSPLIT|NOFRAME, $0-0")
for i := 0; i < 64; i++ {
fmt.Fprintln(w, "\tMOVUPS\t(SI), X0")
fmt.Fprintln(w, "\tADDQ\t$16, SI")
diff --git a/src/runtime/race_amd64.s b/src/runtime/race_amd64.s
index c679a87..0697be7 100644
--- a/src/runtime/race_amd64.s
+++ b/src/runtime/race_amd64.s
@@ -174,7 +174,7 @@
// Common code for racefuncenter
// R11 = caller's return address
-TEXT racefuncenter<>(SB), NOSPLIT, $0-0
+TEXT racefuncenter<>(SB), NOSPLIT|NOFRAME, $0-0
MOVQ DX, BX // save function entry context (for closures)
MOVQ g_racectx(R14), RARG0 // goroutine context
MOVQ R11, RARG1
@@ -196,13 +196,13 @@
// Atomic operations for sync/atomic package.
// Load
-TEXT sync∕atomic·LoadInt32(SB), NOSPLIT, $0-12
+TEXT sync∕atomic·LoadInt32(SB), NOSPLIT|NOFRAME, $0-12
GO_ARGS
MOVQ $__tsan_go_atomic32_load(SB), AX
CALL racecallatomic<>(SB)
RET
-TEXT sync∕atomic·LoadInt64(SB), NOSPLIT, $0-16
+TEXT sync∕atomic·LoadInt64(SB), NOSPLIT|NOFRAME, $0-16
GO_ARGS
MOVQ $__tsan_go_atomic64_load(SB), AX
CALL racecallatomic<>(SB)
@@ -225,13 +225,13 @@
JMP sync∕atomic·LoadInt64(SB)
// Store
-TEXT sync∕atomic·StoreInt32(SB), NOSPLIT, $0-12
+TEXT sync∕atomic·StoreInt32(SB), NOSPLIT|NOFRAME, $0-12
GO_ARGS
MOVQ $__tsan_go_atomic32_store(SB), AX
CALL racecallatomic<>(SB)
RET
-TEXT sync∕atomic·StoreInt64(SB), NOSPLIT, $0-16
+TEXT sync∕atomic·StoreInt64(SB), NOSPLIT|NOFRAME, $0-16
GO_ARGS
MOVQ $__tsan_go_atomic64_store(SB), AX
CALL racecallatomic<>(SB)
@@ -250,13 +250,13 @@
JMP sync∕atomic·StoreInt64(SB)
// Swap
-TEXT sync∕atomic·SwapInt32(SB), NOSPLIT, $0-20
+TEXT sync∕atomic·SwapInt32(SB), NOSPLIT|NOFRAME, $0-20
GO_ARGS
MOVQ $__tsan_go_atomic32_exchange(SB), AX
CALL racecallatomic<>(SB)
RET
-TEXT sync∕atomic·SwapInt64(SB), NOSPLIT, $0-24
+TEXT sync∕atomic·SwapInt64(SB), NOSPLIT|NOFRAME, $0-24
GO_ARGS
MOVQ $__tsan_go_atomic64_exchange(SB), AX
CALL racecallatomic<>(SB)
@@ -275,7 +275,7 @@
JMP sync∕atomic·SwapInt64(SB)
// Add
-TEXT sync∕atomic·AddInt32(SB), NOSPLIT, $0-20
+TEXT sync∕atomic·AddInt32(SB), NOSPLIT|NOFRAME, $0-20
GO_ARGS
MOVQ $__tsan_go_atomic32_fetch_add(SB), AX
CALL racecallatomic<>(SB)
@@ -283,7 +283,7 @@
ADDL AX, ret+16(FP)
RET
-TEXT sync∕atomic·AddInt64(SB), NOSPLIT, $0-24
+TEXT sync∕atomic·AddInt64(SB), NOSPLIT|NOFRAME, $0-24
GO_ARGS
MOVQ $__tsan_go_atomic64_fetch_add(SB), AX
CALL racecallatomic<>(SB)
@@ -304,13 +304,13 @@
JMP sync∕atomic·AddInt64(SB)
// CompareAndSwap
-TEXT sync∕atomic·CompareAndSwapInt32(SB), NOSPLIT, $0-17
+TEXT sync∕atomic·CompareAndSwapInt32(SB), NOSPLIT|NOFRAME, $0-17
GO_ARGS
MOVQ $__tsan_go_atomic32_compare_exchange(SB), AX
CALL racecallatomic<>(SB)
RET
-TEXT sync∕atomic·CompareAndSwapInt64(SB), NOSPLIT, $0-25
+TEXT sync∕atomic·CompareAndSwapInt64(SB), NOSPLIT|NOFRAME, $0-25
GO_ARGS
MOVQ $__tsan_go_atomic64_compare_exchange(SB), AX
CALL racecallatomic<>(SB)
@@ -330,7 +330,7 @@
// Generic atomic operation implementation.
// AX already contains target function.
-TEXT racecallatomic<>(SB), NOSPLIT, $0-0
+TEXT racecallatomic<>(SB), NOSPLIT|NOFRAME, $0-0
// Trigger SIGSEGV early.
MOVQ 16(SP), R12
MOVL (R12), R13
index 7cab08e..5734a3a 100644
--- a/src/runtime/sys_windows_amd64.s
+++ b/src/runtime/sys_windows_amd64.s
@@ -142,7 +142,7 @@
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 @@
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 @@
// 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)
diff --git a/src/runtime/wincallback.go b/src/runtime/wincallback.go
index 9ec2027..14847db 100644
--- a/src/runtime/wincallback.go
+++ b/src/runtime/wincallback.go
@@ -23,6 +23,8 @@
//go:build 386 || amd64
+#include "textflag.h"
+
// runtime·callbackasm is called by external code to
// execute Go implemented callback function. It is not
// called from the start, instead runtime·compilecallback
@@ -31,7 +33,7 @@
// CALL instruction in runtime·callbackasm. This determines
// which Go callback function is executed later on.
-TEXT runtime·callbackasm(SB),7,$0
+TEXT runtime·callbackasm(SB),NOSPLIT|NOFRAME,$0
`)
for i := 0; i < maxCallback; i++ {
buf.WriteString("\tCALL\truntime·callbackasm1(SB)\n")
diff --git a/src/runtime/zcallback_windows.s b/src/runtime/zcallback_windows.s
index bd23d71..86d70d6 100644
--- a/src/runtime/zcallback_windows.s
+++ b/src/runtime/zcallback_windows.s
@@ -2,6 +2,8 @@
//go:build 386 || amd64
+#include "textflag.h"
+
// runtime·callbackasm is called by external code to
// execute Go implemented callback function. It is not
// called from the start, instead runtime·compilecallback
@@ -10,7 +12,7 @@
// CALL instruction in runtime·callbackasm. This determines
// which Go callback function is executed later on.
-TEXT runtime·callbackasm(SB),7,$0
+TEXT runtime·callbackasm(SB),NOSPLIT|NOFRAME,$0
CALL runtime·callbackasm1(SB)
CALL runtime·callbackasm1(SB)
CALL runtime·callbackasm1(SB)
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Quim Muntal (Gerrit)
Jan 24, 2023, 3:13:23 PM1/24/23
to goph...@pubsubhelper.golang.org, Matthew Dempsky, Cherry Mui, Gopher Robot, Ian Lance Taylor, golang-co...@googlegroups.com
1 comment:
Patchset:
This CL has broken the windows-amd64-2008 builder.
It's late here, tomorrow I'll fix or revert.
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Dmitri Shuralyov (Gerrit)
Jan 25, 2023, 5:26:59 PM1/25/23
to Quim Muntal, goph...@pubsubhelper.golang.org, Heschi Kreinick, Dmitri Shuralyov, Matthew Dempsky, Cherry Mui, Gopher Robot, Ian Lance Taylor, golang-co...@googlegroups.com
1 comment:
Patchset:
This CL has broken the windows-amd64-2008 builder. […]
That builder just needs to be updated not to test tip (where 1.21 development is currently happening) per accepted proposal #57003. I've sent CL 463578 for that.
To view, visit change 459395. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages