Commit 35a5bd64 authored by Shenghou Ma's avatar Shenghou Ma Committed by Minux Ma

runtime: make it possible to call syscall on solaris without g

The nosplit stack is now much bigger, so we can afford to allocate
libcall on stack.

Fix asmsysvicall6 to not update errno if g == nil.

These two fixes TestCgoCallbackGC on solaris, which used to stuck
in a loop.

Change-Id: Id1b13be992dae9f059aa3d47ffffd37785300933
Reviewed-on: https://go-review.googlesource.com/17076
Run-TryBot: Minux Ma <minux@golang.org>
Reviewed-by: 's avatarIan Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent d6ee6c2d
...@@ -31,71 +31,71 @@ var asmsysvicall6 libcFunc ...@@ -31,71 +31,71 @@ var asmsysvicall6 libcFunc
//go:nosplit //go:nosplit
func sysvicall0(fn *libcFunc) uintptr { func sysvicall0(fn *libcFunc) uintptr {
libcall := &getg().m.libcall var libcall libcall
libcall.fn = uintptr(unsafe.Pointer(fn)) libcall.fn = uintptr(unsafe.Pointer(fn))
libcall.n = 0 libcall.n = 0
libcall.args = uintptr(unsafe.Pointer(fn)) // it's unused but must be non-nil, otherwise crashes libcall.args = uintptr(unsafe.Pointer(fn)) // it's unused but must be non-nil, otherwise crashes
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall))
return libcall.r1 return libcall.r1
} }
//go:nosplit //go:nosplit
func sysvicall1(fn *libcFunc, a1 uintptr) uintptr { func sysvicall1(fn *libcFunc, a1 uintptr) uintptr {
libcall := &getg().m.libcall var libcall libcall
libcall.fn = uintptr(unsafe.Pointer(fn)) libcall.fn = uintptr(unsafe.Pointer(fn))
libcall.n = 1 libcall.n = 1
// TODO(rsc): Why is noescape necessary here and below? // TODO(rsc): Why is noescape necessary here and below?
libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) libcall.args = uintptr(noescape(unsafe.Pointer(&a1)))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall))
return libcall.r1 return libcall.r1
} }
//go:nosplit //go:nosplit
func sysvicall2(fn *libcFunc, a1, a2 uintptr) uintptr { func sysvicall2(fn *libcFunc, a1, a2 uintptr) uintptr {
libcall := &getg().m.libcall var libcall libcall
libcall.fn = uintptr(unsafe.Pointer(fn)) libcall.fn = uintptr(unsafe.Pointer(fn))
libcall.n = 2 libcall.n = 2
libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) libcall.args = uintptr(noescape(unsafe.Pointer(&a1)))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall))
return libcall.r1 return libcall.r1
} }
//go:nosplit //go:nosplit
func sysvicall3(fn *libcFunc, a1, a2, a3 uintptr) uintptr { func sysvicall3(fn *libcFunc, a1, a2, a3 uintptr) uintptr {
libcall := &getg().m.libcall var libcall libcall
libcall.fn = uintptr(unsafe.Pointer(fn)) libcall.fn = uintptr(unsafe.Pointer(fn))
libcall.n = 3 libcall.n = 3
libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) libcall.args = uintptr(noescape(unsafe.Pointer(&a1)))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall))
return libcall.r1 return libcall.r1
} }
//go:nosplit //go:nosplit
func sysvicall4(fn *libcFunc, a1, a2, a3, a4 uintptr) uintptr { func sysvicall4(fn *libcFunc, a1, a2, a3, a4 uintptr) uintptr {
libcall := &getg().m.libcall var libcall libcall
libcall.fn = uintptr(unsafe.Pointer(fn)) libcall.fn = uintptr(unsafe.Pointer(fn))
libcall.n = 4 libcall.n = 4
libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) libcall.args = uintptr(noescape(unsafe.Pointer(&a1)))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall))
return libcall.r1 return libcall.r1
} }
//go:nosplit //go:nosplit
func sysvicall5(fn *libcFunc, a1, a2, a3, a4, a5 uintptr) uintptr { func sysvicall5(fn *libcFunc, a1, a2, a3, a4, a5 uintptr) uintptr {
libcall := &getg().m.libcall var libcall libcall
libcall.fn = uintptr(unsafe.Pointer(fn)) libcall.fn = uintptr(unsafe.Pointer(fn))
libcall.n = 5 libcall.n = 5
libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) libcall.args = uintptr(noescape(unsafe.Pointer(&a1)))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall))
return libcall.r1 return libcall.r1
} }
//go:nosplit //go:nosplit
func sysvicall6(fn *libcFunc, a1, a2, a3, a4, a5, a6 uintptr) uintptr { func sysvicall6(fn *libcFunc, a1, a2, a3, a4, a5, a6 uintptr) uintptr {
libcall := &getg().m.libcall var libcall libcall
libcall.fn = uintptr(unsafe.Pointer(fn)) libcall.fn = uintptr(unsafe.Pointer(fn))
libcall.n = 6 libcall.n = 6
libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) libcall.args = uintptr(noescape(unsafe.Pointer(&a1)))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall))
return libcall.r1 return libcall.r1
} }
...@@ -80,6 +80,8 @@ TEXT runtime·asmsysvicall6(SB),NOSPLIT,$0 ...@@ -80,6 +80,8 @@ TEXT runtime·asmsysvicall6(SB),NOSPLIT,$0
get_tls(CX) get_tls(CX)
MOVQ g(CX), BX MOVQ g(CX), BX
CMPQ BX, $0
JEQ skiperrno1
MOVQ g_m(BX), BX MOVQ g_m(BX), BX
MOVQ (m_mOS+mOS_perrno)(BX), DX MOVQ (m_mOS+mOS_perrno)(BX), DX
CMPQ DX, $0 CMPQ DX, $0
...@@ -108,6 +110,8 @@ skipargs: ...@@ -108,6 +110,8 @@ skipargs:
get_tls(CX) get_tls(CX)
MOVQ g(CX), BX MOVQ g(CX), BX
CMPQ BX, $0
JEQ skiperrno2
MOVQ g_m(BX), BX MOVQ g_m(BX), BX
MOVQ (m_mOS+mOS_perrno)(BX), AX MOVQ (m_mOS+mOS_perrno)(BX), AX
CMPQ AX, $0 CMPQ AX, $0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment