|
1 From 497e4a8093939f53861d48a0afc081183f7032f4 Mon Sep 17 00:00:00 2001 |
|
2 From: Shenghou Ma <[email protected]> |
|
3 Date: Fri, 20 Nov 2015 00:23:52 -0500 |
|
4 Subject: [PATCH 55/63] [release-branch.go1.5] runtime: make it possible to |
|
5 call syscall on solaris without g |
|
6 MIME-Version: 1.0 |
|
7 Content-Type: text/plain; charset=UTF-8 |
|
8 Content-Transfer-Encoding: 8bit |
|
9 |
|
10 The nosplit stack is now much bigger, so we can afford to allocate |
|
11 libcall on stack. |
|
12 |
|
13 Fix asmsysvicall6 to not update errno if g == nil. |
|
14 |
|
15 These two fixes TestCgoCallbackGC on solaris, which used to stuck |
|
16 in a loop. |
|
17 |
|
18 Change-Id: Id1b13be992dae9f059aa3d47ffffd37785300933 |
|
19 Reviewed-on: https://go-review.googlesource.com/17076 |
|
20 Run-TryBot: Minux Ma <[email protected]> |
|
21 Reviewed-by: Ian Lance Taylor <[email protected]> |
|
22 TryBot-Result: Gobot Gobot <[email protected]> |
|
23 Reviewed-on: https://go-review.googlesource.com/17140 |
|
24 Reviewed-by: Aram Hăvărneanu <[email protected]> |
|
25 --- |
|
26 src/runtime/os_solaris.go | 28 ++++++++++++++-------------- |
|
27 src/runtime/sys_solaris_amd64.s | 4 ++++ |
|
28 2 files changed, 18 insertions(+), 14 deletions(-) |
|
29 |
|
30 diff --git a/src/runtime/os_solaris.go b/src/runtime/os_solaris.go |
|
31 index fd20a5c..95269a7 100644 |
|
32 --- a/src/runtime/os_solaris.go |
|
33 +++ b/src/runtime/os_solaris.go |
|
34 @@ -15,71 +15,71 @@ func sigfwd(fn uintptr, sig uint32, info *siginfo, ctx unsafe.Pointer) |
|
35 |
|
36 //go:nosplit |
|
37 func sysvicall0(fn *libcFunc) uintptr { |
|
38 - libcall := &getg().m.libcall |
|
39 + var libcall libcall |
|
40 libcall.fn = uintptr(unsafe.Pointer(fn)) |
|
41 libcall.n = 0 |
|
42 libcall.args = uintptr(unsafe.Pointer(fn)) // it's unused but must be non-nil, otherwise crashes |
|
43 - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) |
|
44 + asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall)) |
|
45 return libcall.r1 |
|
46 } |
|
47 |
|
48 //go:nosplit |
|
49 func sysvicall1(fn *libcFunc, a1 uintptr) uintptr { |
|
50 - libcall := &getg().m.libcall |
|
51 + var libcall libcall |
|
52 libcall.fn = uintptr(unsafe.Pointer(fn)) |
|
53 libcall.n = 1 |
|
54 // TODO(rsc): Why is noescape necessary here and below? |
|
55 libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) |
|
56 - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) |
|
57 + asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall)) |
|
58 return libcall.r1 |
|
59 } |
|
60 |
|
61 //go:nosplit |
|
62 func sysvicall2(fn *libcFunc, a1, a2 uintptr) uintptr { |
|
63 - libcall := &getg().m.libcall |
|
64 + var libcall libcall |
|
65 libcall.fn = uintptr(unsafe.Pointer(fn)) |
|
66 libcall.n = 2 |
|
67 libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) |
|
68 - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) |
|
69 + asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall)) |
|
70 return libcall.r1 |
|
71 } |
|
72 |
|
73 //go:nosplit |
|
74 func sysvicall3(fn *libcFunc, a1, a2, a3 uintptr) uintptr { |
|
75 - libcall := &getg().m.libcall |
|
76 + var libcall libcall |
|
77 libcall.fn = uintptr(unsafe.Pointer(fn)) |
|
78 libcall.n = 3 |
|
79 libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) |
|
80 - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) |
|
81 + asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall)) |
|
82 return libcall.r1 |
|
83 } |
|
84 |
|
85 //go:nosplit |
|
86 func sysvicall4(fn *libcFunc, a1, a2, a3, a4 uintptr) uintptr { |
|
87 - libcall := &getg().m.libcall |
|
88 + var libcall libcall |
|
89 libcall.fn = uintptr(unsafe.Pointer(fn)) |
|
90 libcall.n = 4 |
|
91 libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) |
|
92 - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) |
|
93 + asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall)) |
|
94 return libcall.r1 |
|
95 } |
|
96 |
|
97 //go:nosplit |
|
98 func sysvicall5(fn *libcFunc, a1, a2, a3, a4, a5 uintptr) uintptr { |
|
99 - libcall := &getg().m.libcall |
|
100 + var libcall libcall |
|
101 libcall.fn = uintptr(unsafe.Pointer(fn)) |
|
102 libcall.n = 5 |
|
103 libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) |
|
104 - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) |
|
105 + asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall)) |
|
106 return libcall.r1 |
|
107 } |
|
108 |
|
109 //go:nosplit |
|
110 func sysvicall6(fn *libcFunc, a1, a2, a3, a4, a5, a6 uintptr) uintptr { |
|
111 - libcall := &getg().m.libcall |
|
112 + var libcall libcall |
|
113 libcall.fn = uintptr(unsafe.Pointer(fn)) |
|
114 libcall.n = 6 |
|
115 libcall.args = uintptr(noescape(unsafe.Pointer(&a1))) |
|
116 - asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(libcall)) |
|
117 + asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&libcall)) |
|
118 return libcall.r1 |
|
119 } |
|
120 diff --git a/src/runtime/sys_solaris_amd64.s b/src/runtime/sys_solaris_amd64.s |
|
121 index e431564..18098d2 100644 |
|
122 --- a/src/runtime/sys_solaris_amd64.s |
|
123 +++ b/src/runtime/sys_solaris_amd64.s |
|
124 @@ -80,6 +80,8 @@ TEXT runtime·asmsysvicall6(SB),NOSPLIT,$0 |
|
125 |
|
126 get_tls(CX) |
|
127 MOVQ g(CX), BX |
|
128 + CMPQ BX, $0 |
|
129 + JEQ skiperrno1 |
|
130 MOVQ g_m(BX), BX |
|
131 MOVQ m_perrno(BX), DX |
|
132 CMPQ DX, $0 |
|
133 @@ -108,6 +110,8 @@ skipargs: |
|
134 |
|
135 get_tls(CX) |
|
136 MOVQ g(CX), BX |
|
137 + CMPQ BX, $0 |
|
138 + JEQ skiperrno2 |
|
139 MOVQ g_m(BX), BX |
|
140 MOVQ m_perrno(BX), AX |
|
141 CMPQ AX, $0 |
|
142 -- |
|
143 2.6.1 |
|
144 |