all: fix for 1.21 (#145)
- commit
- 26d1789b9e6a34cefab6065ad5fec073ab83666b
- author
- TotallyGamerJet · · 2023-07-20 11:01 UTC
- committer
- GitHub · · 2023-07-20 11:01 UTC
- parent
- b178e75
- signature
- GPG Unverified
4AEE18F83AFDEB23The key is unknown
18 files · +192 -38
M .github/workflows/test.yml +1 -1
| @@ -7,7 +7,7 @@ jobs: | |||
| 7 | 7 | strategy: | |
| 8 | 8 | matrix: | |
| 9 | 9 | os: [ubuntu-latest, macos-latest, windows-latest] | |
| 10 | - | go: ['1.18.x', '1.19.x', '1.20.x'] | |
| 10 | + | go: ['1.18.x', '1.19.x', '1.20.x', '1.21.0-rc.3'] | |
| 11 | 11 | name: Test with Go ${{ matrix.go }} on ${{ matrix.os }} | |
| 12 | 12 | runs-on: ${{ matrix.os }} | |
| 13 | 13 | defaults: | |
| @@ -7,7 +7,7 @@ jobs: | |||||
| 7 | strategy: | 7 | strategy: | ||
| 8 | matrix: | 8 | matrix: | ||
| 9 | os: [ubuntu-latest, macos-latest, windows-latest] | 9 | os: [ubuntu-latest, macos-latest, windows-latest] | ||
| 10 | - | go: ['1.18.x', '1.19.x', '1.20.x'] | 10 | + | go: ['1.18.x', '1.19.x', '1.20.x', '1.21.0-rc.3'] |
| 11 | name: Test with Go ${{ matrix.go }} on ${{ matrix.os }} | 11 | name: Test with Go ${{ matrix.go }} on ${{ matrix.os }} | ||
| 12 | runs-on: ${{ matrix.os }} | 12 | runs-on: ${{ matrix.os }} | ||
| 13 | defaults: | 13 | defaults: | ||
M dlfcn_stubs.s +4 -4
| @@ -6,21 +6,21 @@ | |||
| 6 | 6 | #include "textflag.h" | |
| 7 | 7 | ||
| 8 | 8 | // func dlopen(path *byte, mode int) (ret uintptr) | |
| 9 | - | TEXT dlopen(SB), NOSPLIT, $0-0 | |
| 9 | + | TEXT dlopen(SB), NOSPLIT|NOFRAME, $0-0 | |
| 10 | 10 | JMP purego_dlopen(SB) | |
| 11 | 11 | RET | |
| 12 | 12 | ||
| 13 | 13 | // func dlsym(handle uintptr, symbol *byte) (ret uintptr) | |
| 14 | - | TEXT dlsym(SB), NOSPLIT, $0-0 | |
| 14 | + | TEXT dlsym(SB), NOSPLIT|NOFRAME, $0-0 | |
| 15 | 15 | JMP purego_dlsym(SB) | |
| 16 | 16 | RET | |
| 17 | 17 | ||
| 18 | 18 | // func dlerror() (ret *byte) | |
| 19 | - | TEXT dlerror(SB), NOSPLIT, $0-0 | |
| 19 | + | TEXT dlerror(SB), NOSPLIT|NOFRAME, $0-0 | |
| 20 | 20 | JMP purego_dlerror(SB) | |
| 21 | 21 | RET | |
| 22 | 22 | ||
| 23 | 23 | // func dlclose(handle uintptr) (ret int) | |
| 24 | - | TEXT dlclose(SB), NOSPLIT, $0-0 | |
| 24 | + | TEXT dlclose(SB), NOSPLIT|NOFRAME, $0-0 | |
| 25 | 25 | JMP purego_dlclose(SB) | |
| 26 | 26 | RET | |
| @@ -6,21 +6,21 @@ | |||||
| 6 | #include "textflag.h" | 6 | #include "textflag.h" | ||
| 7 | 7 | ||||
| 8 | // func dlopen(path *byte, mode int) (ret uintptr) | 8 | // func dlopen(path *byte, mode int) (ret uintptr) | ||
| 9 | - | TEXT dlopen(SB), NOSPLIT, $0-0 | 9 | + | TEXT dlopen(SB), NOSPLIT|NOFRAME, $0-0 |
| 10 | JMP purego_dlopen(SB) | 10 | JMP purego_dlopen(SB) | ||
| 11 | RET | 11 | RET | ||
| 12 | 12 | ||||
| 13 | // func dlsym(handle uintptr, symbol *byte) (ret uintptr) | 13 | // func dlsym(handle uintptr, symbol *byte) (ret uintptr) | ||
| 14 | - | TEXT dlsym(SB), NOSPLIT, $0-0 | 14 | + | TEXT dlsym(SB), NOSPLIT|NOFRAME, $0-0 |
| 15 | JMP purego_dlsym(SB) | 15 | JMP purego_dlsym(SB) | ||
| 16 | RET | 16 | RET | ||
| 17 | 17 | ||||
| 18 | // func dlerror() (ret *byte) | 18 | // func dlerror() (ret *byte) | ||
| 19 | - | TEXT dlerror(SB), NOSPLIT, $0-0 | 19 | + | TEXT dlerror(SB), NOSPLIT|NOFRAME, $0-0 |
| 20 | JMP purego_dlerror(SB) | 20 | JMP purego_dlerror(SB) | ||
| 21 | RET | 21 | RET | ||
| 22 | 22 | ||||
| 23 | // func dlclose(handle uintptr) (ret int) | 23 | // func dlclose(handle uintptr) (ret int) | ||
| 24 | - | TEXT dlclose(SB), NOSPLIT, $0-0 | 24 | + | TEXT dlclose(SB), NOSPLIT|NOFRAME, $0-0 |
| 25 | JMP purego_dlclose(SB) | 25 | JMP purego_dlclose(SB) | ||
| 26 | RET | 26 | RET | ||
M internal/fakecgo/callbacks.go +30 -1
| @@ -6,7 +6,9 @@ | |||
| 6 | 6 | ||
| 7 | 7 | package fakecgo | |
| 8 | 8 | ||
| 9 | - | import _ "unsafe" | |
| 9 | + | import ( | |
| 10 | + | _ "unsafe" | |
| 11 | + | ) | |
| 10 | 12 | ||
| 11 | 13 | // TODO: decide if we need _runtime_cgo_panic_internal | |
| 12 | 14 | ||
| @@ -39,6 +41,33 @@ var _cgo_thread_start = &x_cgo_thread_start_trampoline | |||
| 39 | 41 | var x_cgo_notify_runtime_init_done_trampoline byte | |
| 40 | 42 | var _cgo_notify_runtime_init_done = &x_cgo_notify_runtime_init_done_trampoline | |
| 41 | 43 | ||
| 44 | + | // Indicates whether a dummy thread key has been created or not. | |
| 45 | + | // | |
| 46 | + | // When calling go exported function from C, we register a destructor | |
| 47 | + | // callback, for a dummy thread key, by using pthread_key_create. | |
| 48 | + | ||
| 49 | + | //go:linkname _cgo_pthread_key_created _cgo_pthread_key_created | |
| 50 | + | var x_cgo_pthread_key_created uintptr | |
| 51 | + | var _cgo_pthread_key_created = &x_cgo_pthread_key_created | |
| 52 | + | ||
| 53 | + | // Set the x_crosscall2_ptr C function pointer variable point to crosscall2. | |
| 54 | + | // It's for the runtime package to call at init time. | |
| 55 | + | func set_crosscall2() { | |
| 56 | + | // nothing needs to be done here for fakecgo | |
| 57 | + | // because it's possible to just call cgocallback directly | |
| 58 | + | } | |
| 59 | + | ||
| 60 | + | //go:linkname _set_crosscall2 runtime.set_crosscall2 | |
| 61 | + | var _set_crosscall2 = set_crosscall2 | |
| 62 | + | ||
| 63 | + | // Store the g into the thread-specific value. | |
| 64 | + | // So that pthread_key_destructor will dropm when the thread is exiting. | |
| 65 | + | ||
| 66 | + | //go:linkname x_cgo_bindm_trampoline x_cgo_bindm_trampoline | |
| 67 | + | //go:linkname _cgo_bindm _cgo_bindm | |
| 68 | + | var x_cgo_bindm_trampoline byte | |
| 69 | + | var _cgo_bindm = &x_cgo_bindm_trampoline | |
| 70 | + | ||
| 42 | 71 | // TODO: decide if we need x_cgo_set_context_function | |
| 43 | 72 | // TODO: decide if we need _cgo_yield | |
| 44 | 73 | ||
| @@ -6,7 +6,9 @@ | |||||
| 6 | 6 | ||||
| 7 | package fakecgo | 7 | package fakecgo | ||
| 8 | 8 | ||||
| 9 | - | import _ "unsafe" | 9 | + | import ( |
| 10 | + | _ "unsafe" | |||
| 11 | + | ) | |||
| 10 | 12 | ||||
| 11 | // TODO: decide if we need _runtime_cgo_panic_internal | 13 | // TODO: decide if we need _runtime_cgo_panic_internal | ||
| 12 | 14 | ||||
| @@ -39,6 +41,33 @@ var _cgo_thread_start = &x_cgo_thread_start_trampoline | |||||
| 39 | var x_cgo_notify_runtime_init_done_trampoline byte | 41 | var x_cgo_notify_runtime_init_done_trampoline byte | ||
| 40 | var _cgo_notify_runtime_init_done = &x_cgo_notify_runtime_init_done_trampoline | 42 | var _cgo_notify_runtime_init_done = &x_cgo_notify_runtime_init_done_trampoline | ||
| 41 | 43 | ||||
| 44 | + | // Indicates whether a dummy thread key has been created or not. | |||
| 45 | + | // | |||
| 46 | + | // When calling go exported function from C, we register a destructor | |||
| 47 | + | // callback, for a dummy thread key, by using pthread_key_create. | |||
| 48 | + | ||||
| 49 | + | //go:linkname _cgo_pthread_key_created _cgo_pthread_key_created | |||
| 50 | + | var x_cgo_pthread_key_created uintptr | |||
| 51 | + | var _cgo_pthread_key_created = &x_cgo_pthread_key_created | |||
| 52 | + | ||||
| 53 | + | // Set the x_crosscall2_ptr C function pointer variable point to crosscall2. | |||
| 54 | + | // It's for the runtime package to call at init time. | |||
| 55 | + | func set_crosscall2() { | |||
| 56 | + | // nothing needs to be done here for fakecgo | |||
| 57 | + | // because it's possible to just call cgocallback directly | |||
| 58 | + | } | |||
| 59 | + | ||||
| 60 | + | //go:linkname _set_crosscall2 runtime.set_crosscall2 | |||
| 61 | + | var _set_crosscall2 = set_crosscall2 | |||
| 62 | + | ||||
| 63 | + | // Store the g into the thread-specific value. | |||
| 64 | + | // So that pthread_key_destructor will dropm when the thread is exiting. | |||
| 65 | + | ||||
| 66 | + | //go:linkname x_cgo_bindm_trampoline x_cgo_bindm_trampoline | |||
| 67 | + | //go:linkname _cgo_bindm _cgo_bindm | |||
| 68 | + | var x_cgo_bindm_trampoline byte | |||
| 69 | + | var _cgo_bindm = &x_cgo_bindm_trampoline | |||
| 70 | + | ||||
| 42 | // TODO: decide if we need x_cgo_set_context_function | 71 | // TODO: decide if we need x_cgo_set_context_function | ||
| 43 | // TODO: decide if we need _cgo_yield | 72 | // TODO: decide if we need _cgo_yield | ||
| 44 | 73 | ||||
M internal/fakecgo/gen.go +5 -1
| @@ -94,7 +94,7 @@ const templateTrampolinesStubs = `// Code generated by 'go generate' with gen.go | |||
| 94 | 94 | ||
| 95 | 95 | // these stubs are here because it is not possible to go:linkname directly the C functions on darwin arm64 | |
| 96 | 96 | {{ range . }} | |
| 97 | - | TEXT _{{.Name}}(SB), NOSPLIT, $0-0 | |
| 97 | + | TEXT _{{.Name}}(SB), NOSPLIT|NOFRAME, $0-0 | |
| 98 | 98 | JMP purego_{{.Name}}(SB) | |
| 99 | 99 | RET | |
| 100 | 100 | {{ end -}} | |
| @@ -131,6 +131,10 @@ var ( | |||
| 131 | 131 | {"pthread_attr_getstacksize", [5]Arg{{"attr", "*pthread_attr_t"}, {"stacksize", "*size_t"}}, "int32"}, | |
| 132 | 132 | {"pthread_attr_setstacksize", [5]Arg{{"attr", "*pthread_attr_t"}, {"size", "size_t"}}, "int32"}, | |
| 133 | 133 | {"pthread_attr_destroy", [5]Arg{{"attr", "*pthread_attr_t"}}, "int32"}, | |
| 134 | + | {"pthread_mutex_lock", [5]Arg{{"mutex", "*pthread_mutex_t"}}, "int32"}, | |
| 135 | + | {"pthread_mutex_unlock", [5]Arg{{"mutex", "*pthread_mutex_t"}}, "int32"}, | |
| 136 | + | {"pthread_cond_broadcast", [5]Arg{{"cond", "*pthread_cond_t"}}, "int32"}, | |
| 137 | + | {"pthread_setspecific", [5]Arg{{"key", "pthread_key_t"}, {"value", "unsafe.Pointer"}}, "int32"}, | |
| 134 | 138 | } | |
| 135 | 139 | ) | |
| 136 | 140 | ||
| @@ -94,7 +94,7 @@ const templateTrampolinesStubs = `// Code generated by 'go generate' with gen.go | |||||
| 94 | 94 | ||||
| 95 | // these stubs are here because it is not possible to go:linkname directly the C functions on darwin arm64 | 95 | // these stubs are here because it is not possible to go:linkname directly the C functions on darwin arm64 | ||
| 96 | {{ range . }} | 96 | {{ range . }} | ||
| 97 | - | TEXT _{{.Name}}(SB), NOSPLIT, $0-0 | 97 | + | TEXT _{{.Name}}(SB), NOSPLIT|NOFRAME, $0-0 |
| 98 | JMP purego_{{.Name}}(SB) | 98 | JMP purego_{{.Name}}(SB) | ||
| 99 | RET | 99 | RET | ||
| 100 | {{ end -}} | 100 | {{ end -}} | ||
| @@ -131,6 +131,10 @@ var ( | |||||
| 131 | {"pthread_attr_getstacksize", [5]Arg{{"attr", "*pthread_attr_t"}, {"stacksize", "*size_t"}}, "int32"}, | 131 | {"pthread_attr_getstacksize", [5]Arg{{"attr", "*pthread_attr_t"}, {"stacksize", "*size_t"}}, "int32"}, | ||
| 132 | {"pthread_attr_setstacksize", [5]Arg{{"attr", "*pthread_attr_t"}, {"size", "size_t"}}, "int32"}, | 132 | {"pthread_attr_setstacksize", [5]Arg{{"attr", "*pthread_attr_t"}, {"size", "size_t"}}, "int32"}, | ||
| 133 | {"pthread_attr_destroy", [5]Arg{{"attr", "*pthread_attr_t"}}, "int32"}, | 133 | {"pthread_attr_destroy", [5]Arg{{"attr", "*pthread_attr_t"}}, "int32"}, | ||
| 134 | + | {"pthread_mutex_lock", [5]Arg{{"mutex", "*pthread_mutex_t"}}, "int32"}, | |||
| 135 | + | {"pthread_mutex_unlock", [5]Arg{{"mutex", "*pthread_mutex_t"}}, "int32"}, | |||
| 136 | + | {"pthread_cond_broadcast", [5]Arg{{"cond", "*pthread_cond_t"}}, "int32"}, | |||
| 137 | + | {"pthread_setspecific", [5]Arg{{"key", "pthread_key_t"}, {"value", "unsafe.Pointer"}}, "int32"}, | |||
| 134 | } | 138 | } | ||
| 135 | ) | 139 | ) | ||
| 136 | 140 | ||||
M internal/fakecgo/go_libinit.go +23 -2
| @@ -10,9 +10,30 @@ import ( | |||
| 10 | 10 | "unsafe" | |
| 11 | 11 | ) | |
| 12 | 12 | ||
| 13 | + | var ( | |
| 14 | + | pthread_g pthread_key_t | |
| 15 | + | ||
| 16 | + | runtime_init_cond = PTHREAD_COND_INITIALIZER | |
| 17 | + | runtime_init_mu = PTHREAD_MUTEX_INITIALIZER | |
| 18 | + | runtime_init_done int | |
| 19 | + | ) | |
| 20 | + | ||
| 13 | 21 | //go:nosplit | |
| 14 | 22 | func x_cgo_notify_runtime_init_done() { | |
| 15 | - | // we don't support being called as a library | |
| 23 | + | pthread_mutex_lock(&runtime_init_mu) | |
| 24 | + | runtime_init_done = 1 | |
| 25 | + | pthread_cond_broadcast(&runtime_init_cond) | |
| 26 | + | pthread_mutex_unlock(&runtime_init_mu) | |
| 27 | + | } | |
| 28 | + | ||
| 29 | + | // Store the g into a thread-specific value associated with the pthread key pthread_g. | |
| 30 | + | // And pthread_key_destructor will dropm when the thread is exiting. | |
| 31 | + | func x_cgo_bindm(g unsafe.Pointer) { | |
| 32 | + | // We assume this will always succeed, otherwise, there might be extra M leaking, | |
| 33 | + | // when a C thread exits after a cgo call. | |
| 34 | + | // We only invoke this function once per thread in runtime.needAndBindM, | |
| 35 | + | // and the next calls just reuse the bound m. | |
| 36 | + | pthread_setspecific(pthread_g, g) | |
| 16 | 37 | } | |
| 17 | 38 | ||
| 18 | 39 | // _cgo_try_pthread_create retries pthread_create if it fails with | |
| @@ -25,7 +46,7 @@ func _cgo_try_pthread_create(thread *pthread_t, attr *pthread_attr_t, pfn unsafe | |||
| 25 | 46 | // tries needs to be the same type as syscall.Timespec.Nsec | |
| 26 | 47 | // but the fields are int32 on 32bit and int64 on 64bit. | |
| 27 | 48 | // tries is assigned to syscall.Timespec.Nsec in order to match its type. | |
| 28 | - | var tries = ts.Nsec | |
| 49 | + | tries := ts.Nsec | |
| 29 | 50 | var err int | |
| 30 | 51 | ||
| 31 | 52 | for tries = 0; tries < 20; tries++ { | |
| @@ -10,9 +10,30 @@ import ( | |||||
| 10 | "unsafe" | 10 | "unsafe" | ||
| 11 | ) | 11 | ) | ||
| 12 | 12 | ||||
| 13 | + | var ( | |||
| 14 | + | pthread_g pthread_key_t | |||
| 15 | + | ||||
| 16 | + | runtime_init_cond = PTHREAD_COND_INITIALIZER | |||
| 17 | + | runtime_init_mu = PTHREAD_MUTEX_INITIALIZER | |||
| 18 | + | runtime_init_done int | |||
| 19 | + | ) | |||
| 20 | + | ||||
| 13 | //go:nosplit | 21 | //go:nosplit | ||
| 14 | func x_cgo_notify_runtime_init_done() { | 22 | func x_cgo_notify_runtime_init_done() { | ||
| 15 | - | // we don't support being called as a library | 23 | + | pthread_mutex_lock(&runtime_init_mu) |
| 24 | + | runtime_init_done = 1 | |||
| 25 | + | pthread_cond_broadcast(&runtime_init_cond) | |||
| 26 | + | pthread_mutex_unlock(&runtime_init_mu) | |||
| 27 | + | } | |||
| 28 | + | ||||
| 29 | + | // Store the g into a thread-specific value associated with the pthread key pthread_g. | |||
| 30 | + | // And pthread_key_destructor will dropm when the thread is exiting. | |||
| 31 | + | func x_cgo_bindm(g unsafe.Pointer) { | |||
| 32 | + | // We assume this will always succeed, otherwise, there might be extra M leaking, | |||
| 33 | + | // when a C thread exits after a cgo call. | |||
| 34 | + | // We only invoke this function once per thread in runtime.needAndBindM, | |||
| 35 | + | // and the next calls just reuse the bound m. | |||
| 36 | + | pthread_setspecific(pthread_g, g) | |||
| 16 | } | 37 | } | ||
| 17 | 38 | ||||
| 18 | // _cgo_try_pthread_create retries pthread_create if it fails with | 39 | // _cgo_try_pthread_create retries pthread_create if it fails with | ||
| @@ -25,7 +46,7 @@ func _cgo_try_pthread_create(thread *pthread_t, attr *pthread_attr_t, pfn unsafe | |||||
| 25 | // tries needs to be the same type as syscall.Timespec.Nsec | 46 | // tries needs to be the same type as syscall.Timespec.Nsec | ||
| 26 | // but the fields are int32 on 32bit and int64 on 64bit. | 47 | // but the fields are int32 on 32bit and int64 on 64bit. | ||
| 27 | // tries is assigned to syscall.Timespec.Nsec in order to match its type. | 48 | // tries is assigned to syscall.Timespec.Nsec in order to match its type. | ||
| 28 | - | var tries = ts.Nsec | 49 | + | tries := ts.Nsec |
| 29 | var err int | 50 | var err int | ||
| 30 | 51 | ||||
| 31 | for tries = 0; tries < 20; tries++ { | 52 | for tries = 0; tries < 20; tries++ { | ||
M internal/fakecgo/libcgo.go +7 -4
| @@ -5,10 +5,13 @@ | |||
| 5 | 5 | ||
| 6 | 6 | package fakecgo | |
| 7 | 7 | ||
| 8 | - | type size_t uintptr | |
| 9 | - | type sigset_t [128]byte | |
| 10 | - | type pthread_attr_t [64]byte | |
| 11 | - | type pthread_t int | |
| 8 | + | type ( | |
| 9 | + | size_t uintptr | |
| 10 | + | sigset_t [128]byte | |
| 11 | + | pthread_attr_t [64]byte | |
| 12 | + | pthread_t int | |
| 13 | + | pthread_key_t uint64 | |
| 14 | + | ) | |
| 12 | 15 | ||
| 13 | 16 | // for pthread_sigmask: | |
| 14 | 17 | ||
| @@ -5,10 +5,13 @@ | |||||
| 5 | 5 | ||||
| 6 | package fakecgo | 6 | package fakecgo | ||
| 7 | 7 | ||||
| 8 | - | type size_t uintptr | 8 | + | type ( |
| 9 | - | type sigset_t [128]byte | 9 | + | size_t uintptr |
| 10 | - | type pthread_attr_t [64]byte | 10 | + | sigset_t [128]byte |
| 11 | - | type pthread_t int | 11 | + | pthread_attr_t [64]byte |
| 12 | + | pthread_t int | |||
| 13 | + | pthread_key_t uint64 | |||
| 14 | + | ) | |||
| 12 | 15 | ||||
| 13 | // for pthread_sigmask: | 16 | // for pthread_sigmask: | ||
| 14 | 17 | ||||
A internal/fakecgo/libcgo_darwin.go +20 -0
| @@ -0,0 +1,20 @@ | |||
| 1 | + | // SPDX-License-Identifier: Apache-2.0 | |
| 2 | + | // SPDX-FileCopyrightText: 2022 The Ebitengine Authors | |
| 3 | + | ||
| 4 | + | package fakecgo | |
| 5 | + | ||
| 6 | + | type ( | |
| 7 | + | pthread_mutex_t struct { | |
| 8 | + | sig int64 | |
| 9 | + | opaque [56]byte | |
| 10 | + | } | |
| 11 | + | pthread_cond_t struct { | |
| 12 | + | sig int64 | |
| 13 | + | opaque [40]byte | |
| 14 | + | } | |
| 15 | + | ) | |
| 16 | + | ||
| 17 | + | var ( | |
| 18 | + | PTHREAD_COND_INITIALIZER = pthread_cond_t{sig: 0x3CB0B1BB} | |
| 19 | + | PTHREAD_MUTEX_INITIALIZER = pthread_mutex_t{sig: 0x32AAABA7} | |
| 20 | + | ) | |
| @@ -0,0 +1,20 @@ | |||||
| 1 | + | // SPDX-License-Identifier: Apache-2.0 | |||
| 2 | + | // SPDX-FileCopyrightText: 2022 The Ebitengine Authors | |||
| 3 | + | ||||
| 4 | + | package fakecgo | |||
| 5 | + | ||||
| 6 | + | type ( | |||
| 7 | + | pthread_mutex_t struct { | |||
| 8 | + | sig int64 | |||
| 9 | + | opaque [56]byte | |||
| 10 | + | } | |||
| 11 | + | pthread_cond_t struct { | |||
| 12 | + | sig int64 | |||
| 13 | + | opaque [40]byte | |||
| 14 | + | } | |||
| 15 | + | ) | |||
| 16 | + | ||||
| 17 | + | var ( | |||
| 18 | + | PTHREAD_COND_INITIALIZER = pthread_cond_t{sig: 0x3CB0B1BB} | |||
| 19 | + | PTHREAD_MUTEX_INITIALIZER = pthread_mutex_t{sig: 0x32AAABA7} | |||
| 20 | + | ) | |||
A internal/fakecgo/libcgo_linux.go +14 -0
| @@ -0,0 +1,14 @@ | |||
| 1 | + | // SPDX-License-Identifier: Apache-2.0 | |
| 2 | + | // SPDX-FileCopyrightText: 2022 The Ebitengine Authors | |
| 3 | + | ||
| 4 | + | package fakecgo | |
| 5 | + | ||
| 6 | + | type ( | |
| 7 | + | pthread_cond_t [48]byte | |
| 8 | + | pthread_mutex_t [48]byte | |
| 9 | + | ) | |
| 10 | + | ||
| 11 | + | var ( | |
| 12 | + | PTHREAD_COND_INITIALIZER = pthread_cond_t{} | |
| 13 | + | PTHREAD_MUTEX_INITIALIZER = pthread_mutex_t{} | |
| 14 | + | ) | |
| @@ -0,0 +1,14 @@ | |||||
| 1 | + | // SPDX-License-Identifier: Apache-2.0 | |||
| 2 | + | // SPDX-FileCopyrightText: 2022 The Ebitengine Authors | |||
| 3 | + | ||||
| 4 | + | package fakecgo | |||
| 5 | + | ||||
| 6 | + | type ( | |||
| 7 | + | pthread_cond_t [48]byte | |||
| 8 | + | pthread_mutex_t [48]byte | |||
| 9 | + | ) | |||
| 10 | + | ||||
| 11 | + | var ( | |||
| 12 | + | PTHREAD_COND_INITIALIZER = pthread_cond_t{} | |||
| 13 | + | PTHREAD_MUTEX_INITIALIZER = pthread_mutex_t{} | |||
| 14 | + | ) | |||
M internal/fakecgo/symbols.go +32 -0
| @@ -87,6 +87,22 @@ func pthread_attr_destroy(attr *pthread_attr_t) int32 { | |||
| 87 | 87 | return int32(call5(pthread_attr_destroyABI0, uintptr(unsafe.Pointer(attr)), 0, 0, 0, 0)) | |
| 88 | 88 | } | |
| 89 | 89 | ||
| 90 | + | func pthread_mutex_lock(mutex *pthread_mutex_t) int32 { | |
| 91 | + | return int32(call5(pthread_mutex_lockABI0, uintptr(unsafe.Pointer(mutex)), 0, 0, 0, 0)) | |
| 92 | + | } | |
| 93 | + | ||
| 94 | + | func pthread_mutex_unlock(mutex *pthread_mutex_t) int32 { | |
| 95 | + | return int32(call5(pthread_mutex_unlockABI0, uintptr(unsafe.Pointer(mutex)), 0, 0, 0, 0)) | |
| 96 | + | } | |
| 97 | + | ||
| 98 | + | func pthread_cond_broadcast(cond *pthread_cond_t) int32 { | |
| 99 | + | return int32(call5(pthread_cond_broadcastABI0, uintptr(unsafe.Pointer(cond)), 0, 0, 0, 0)) | |
| 100 | + | } | |
| 101 | + | ||
| 102 | + | func pthread_setspecific(key pthread_key_t, value unsafe.Pointer) int32 { | |
| 103 | + | return int32(call5(pthread_setspecificABI0, uintptr(key), uintptr(value), 0, 0, 0)) | |
| 104 | + | } | |
| 105 | + | ||
| 90 | 106 | //go:linkname _malloc _malloc | |
| 91 | 107 | var _malloc uintptr | |
| 92 | 108 | var mallocABI0 = uintptr(unsafe.Pointer(&_malloc)) | |
| @@ -150,3 +166,19 @@ var pthread_attr_setstacksizeABI0 = uintptr(unsafe.Pointer(&_pthread_attr_setsta | |||
| 150 | 166 | //go:linkname _pthread_attr_destroy _pthread_attr_destroy | |
| 151 | 167 | var _pthread_attr_destroy uintptr | |
| 152 | 168 | var pthread_attr_destroyABI0 = uintptr(unsafe.Pointer(&_pthread_attr_destroy)) | |
| 169 | + | ||
| 170 | + | //go:linkname _pthread_mutex_lock _pthread_mutex_lock | |
| 171 | + | var _pthread_mutex_lock uintptr | |
| 172 | + | var pthread_mutex_lockABI0 = uintptr(unsafe.Pointer(&_pthread_mutex_lock)) | |
| 173 | + | ||
| 174 | + | //go:linkname _pthread_mutex_unlock _pthread_mutex_unlock | |
| 175 | + | var _pthread_mutex_unlock uintptr | |
| 176 | + | var pthread_mutex_unlockABI0 = uintptr(unsafe.Pointer(&_pthread_mutex_unlock)) | |
| 177 | + | ||
| 178 | + | //go:linkname _pthread_cond_broadcast _pthread_cond_broadcast | |
| 179 | + | var _pthread_cond_broadcast uintptr | |
| 180 | + | var pthread_cond_broadcastABI0 = uintptr(unsafe.Pointer(&_pthread_cond_broadcast)) | |
| 181 | + | ||
| 182 | + | //go:linkname _pthread_setspecific _pthread_setspecific | |
| 183 | + | var _pthread_setspecific uintptr | |
| 184 | + | var pthread_setspecificABI0 = uintptr(unsafe.Pointer(&_pthread_setspecific)) | |
| @@ -87,6 +87,22 @@ func pthread_attr_destroy(attr *pthread_attr_t) int32 { | |||||
| 87 | return int32(call5(pthread_attr_destroyABI0, uintptr(unsafe.Pointer(attr)), 0, 0, 0, 0)) | 87 | return int32(call5(pthread_attr_destroyABI0, uintptr(unsafe.Pointer(attr)), 0, 0, 0, 0)) | ||
| 88 | } | 88 | } | ||
| 89 | 89 | ||||
| 90 | + | func pthread_mutex_lock(mutex *pthread_mutex_t) int32 { | |||
| 91 | + | return int32(call5(pthread_mutex_lockABI0, uintptr(unsafe.Pointer(mutex)), 0, 0, 0, 0)) | |||
| 92 | + | } | |||
| 93 | + | ||||
| 94 | + | func pthread_mutex_unlock(mutex *pthread_mutex_t) int32 { | |||
| 95 | + | return int32(call5(pthread_mutex_unlockABI0, uintptr(unsafe.Pointer(mutex)), 0, 0, 0, 0)) | |||
| 96 | + | } | |||
| 97 | + | ||||
| 98 | + | func pthread_cond_broadcast(cond *pthread_cond_t) int32 { | |||
| 99 | + | return int32(call5(pthread_cond_broadcastABI0, uintptr(unsafe.Pointer(cond)), 0, 0, 0, 0)) | |||
| 100 | + | } | |||
| 101 | + | ||||
| 102 | + | func pthread_setspecific(key pthread_key_t, value unsafe.Pointer) int32 { | |||
| 103 | + | return int32(call5(pthread_setspecificABI0, uintptr(key), uintptr(value), 0, 0, 0)) | |||
| 104 | + | } | |||
| 105 | + | ||||
| 90 | //go:linkname _malloc _malloc | 106 | //go:linkname _malloc _malloc | ||
| 91 | var _malloc uintptr | 107 | var _malloc uintptr | ||
| 92 | var mallocABI0 = uintptr(unsafe.Pointer(&_malloc)) | 108 | var mallocABI0 = uintptr(unsafe.Pointer(&_malloc)) | ||
| @@ -150,3 +166,19 @@ var pthread_attr_setstacksizeABI0 = uintptr(unsafe.Pointer(&_pthread_attr_setsta | |||||
| 150 | //go:linkname _pthread_attr_destroy _pthread_attr_destroy | 166 | //go:linkname _pthread_attr_destroy _pthread_attr_destroy | ||
| 151 | var _pthread_attr_destroy uintptr | 167 | var _pthread_attr_destroy uintptr | ||
| 152 | var pthread_attr_destroyABI0 = uintptr(unsafe.Pointer(&_pthread_attr_destroy)) | 168 | var pthread_attr_destroyABI0 = uintptr(unsafe.Pointer(&_pthread_attr_destroy)) | ||
| 169 | + | ||||
| 170 | + | //go:linkname _pthread_mutex_lock _pthread_mutex_lock | |||
| 171 | + | var _pthread_mutex_lock uintptr | |||
| 172 | + | var pthread_mutex_lockABI0 = uintptr(unsafe.Pointer(&_pthread_mutex_lock)) | |||
| 173 | + | ||||
| 174 | + | //go:linkname _pthread_mutex_unlock _pthread_mutex_unlock | |||
| 175 | + | var _pthread_mutex_unlock uintptr | |||
| 176 | + | var pthread_mutex_unlockABI0 = uintptr(unsafe.Pointer(&_pthread_mutex_unlock)) | |||
| 177 | + | ||||
| 178 | + | //go:linkname _pthread_cond_broadcast _pthread_cond_broadcast | |||
| 179 | + | var _pthread_cond_broadcast uintptr | |||
| 180 | + | var pthread_cond_broadcastABI0 = uintptr(unsafe.Pointer(&_pthread_cond_broadcast)) | |||
| 181 | + | ||||
| 182 | + | //go:linkname _pthread_setspecific _pthread_setspecific | |||
| 183 | + | var _pthread_setspecific uintptr | |||
| 184 | + | var pthread_setspecificABI0 = uintptr(unsafe.Pointer(&_pthread_setspecific)) | |||
M internal/fakecgo/symbols_darwin.go +4 -0
| @@ -21,3 +21,7 @@ package fakecgo | |||
| 21 | 21 | //go:cgo_import_dynamic purego_pthread_attr_getstacksize pthread_attr_getstacksize "/usr/lib/libSystem.B.dylib" | |
| 22 | 22 | //go:cgo_import_dynamic purego_pthread_attr_setstacksize pthread_attr_setstacksize "/usr/lib/libSystem.B.dylib" | |
| 23 | 23 | //go:cgo_import_dynamic purego_pthread_attr_destroy pthread_attr_destroy "/usr/lib/libSystem.B.dylib" | |
| 24 | + | //go:cgo_import_dynamic purego_pthread_mutex_lock pthread_mutex_lock "/usr/lib/libSystem.B.dylib" | |
| 25 | + | //go:cgo_import_dynamic purego_pthread_mutex_unlock pthread_mutex_unlock "/usr/lib/libSystem.B.dylib" | |
| 26 | + | //go:cgo_import_dynamic purego_pthread_cond_broadcast pthread_cond_broadcast "/usr/lib/libSystem.B.dylib" | |
| 27 | + | //go:cgo_import_dynamic purego_pthread_setspecific pthread_setspecific "/usr/lib/libSystem.B.dylib" | |
| @@ -21,3 +21,7 @@ package fakecgo | |||||
| 21 | //go:cgo_import_dynamic purego_pthread_attr_getstacksize pthread_attr_getstacksize "/usr/lib/libSystem.B.dylib" | 21 | //go:cgo_import_dynamic purego_pthread_attr_getstacksize pthread_attr_getstacksize "/usr/lib/libSystem.B.dylib" | ||
| 22 | //go:cgo_import_dynamic purego_pthread_attr_setstacksize pthread_attr_setstacksize "/usr/lib/libSystem.B.dylib" | 22 | //go:cgo_import_dynamic purego_pthread_attr_setstacksize pthread_attr_setstacksize "/usr/lib/libSystem.B.dylib" | ||
| 23 | //go:cgo_import_dynamic purego_pthread_attr_destroy pthread_attr_destroy "/usr/lib/libSystem.B.dylib" | 23 | //go:cgo_import_dynamic purego_pthread_attr_destroy pthread_attr_destroy "/usr/lib/libSystem.B.dylib" | ||
| 24 | + | //go:cgo_import_dynamic purego_pthread_mutex_lock pthread_mutex_lock "/usr/lib/libSystem.B.dylib" | |||
| 25 | + | //go:cgo_import_dynamic purego_pthread_mutex_unlock pthread_mutex_unlock "/usr/lib/libSystem.B.dylib" | |||
| 26 | + | //go:cgo_import_dynamic purego_pthread_cond_broadcast pthread_cond_broadcast "/usr/lib/libSystem.B.dylib" | |||
| 27 | + | //go:cgo_import_dynamic purego_pthread_setspecific pthread_setspecific "/usr/lib/libSystem.B.dylib" | |||
M internal/fakecgo/symbols_linux.go +4 -0
| @@ -21,3 +21,7 @@ package fakecgo | |||
| 21 | 21 | //go:cgo_import_dynamic purego_pthread_attr_getstacksize pthread_attr_getstacksize "libpthread.so.0" | |
| 22 | 22 | //go:cgo_import_dynamic purego_pthread_attr_setstacksize pthread_attr_setstacksize "libpthread.so.0" | |
| 23 | 23 | //go:cgo_import_dynamic purego_pthread_attr_destroy pthread_attr_destroy "libpthread.so.0" | |
| 24 | + | //go:cgo_import_dynamic purego_pthread_mutex_lock pthread_mutex_lock "libpthread.so.0" | |
| 25 | + | //go:cgo_import_dynamic purego_pthread_mutex_unlock pthread_mutex_unlock "libpthread.so.0" | |
| 26 | + | //go:cgo_import_dynamic purego_pthread_cond_broadcast pthread_cond_broadcast "libpthread.so.0" | |
| 27 | + | //go:cgo_import_dynamic purego_pthread_setspecific pthread_setspecific "libpthread.so.0" | |
| @@ -21,3 +21,7 @@ package fakecgo | |||||
| 21 | //go:cgo_import_dynamic purego_pthread_attr_getstacksize pthread_attr_getstacksize "libpthread.so.0" | 21 | //go:cgo_import_dynamic purego_pthread_attr_getstacksize pthread_attr_getstacksize "libpthread.so.0" | ||
| 22 | //go:cgo_import_dynamic purego_pthread_attr_setstacksize pthread_attr_setstacksize "libpthread.so.0" | 22 | //go:cgo_import_dynamic purego_pthread_attr_setstacksize pthread_attr_setstacksize "libpthread.so.0" | ||
| 23 | //go:cgo_import_dynamic purego_pthread_attr_destroy pthread_attr_destroy "libpthread.so.0" | 23 | //go:cgo_import_dynamic purego_pthread_attr_destroy pthread_attr_destroy "libpthread.so.0" | ||
| 24 | + | //go:cgo_import_dynamic purego_pthread_mutex_lock pthread_mutex_lock "libpthread.so.0" | |||
| 25 | + | //go:cgo_import_dynamic purego_pthread_mutex_unlock pthread_mutex_unlock "libpthread.so.0" | |||
| 26 | + | //go:cgo_import_dynamic purego_pthread_cond_broadcast pthread_cond_broadcast "libpthread.so.0" | |||
| 27 | + | //go:cgo_import_dynamic purego_pthread_setspecific pthread_setspecific "libpthread.so.0" | |||
M internal/fakecgo/trampolines_amd64.s +4 -0
| @@ -61,6 +61,10 @@ TEXT x_cgo_notify_runtime_init_done_trampoline(SB), NOSPLIT, $0 | |||
| 61 | 61 | CALL ·x_cgo_notify_runtime_init_done(SB) | |
| 62 | 62 | RET | |
| 63 | 63 | ||
| 64 | + | TEXT x_cgo_bindm_trampoline(SB), NOSPLIT, $0 | |
| 65 | + | CALL ·x_cgo_bindm(SB) | |
| 66 | + | RET | |
| 67 | + | ||
| 64 | 68 | // func setg_trampoline(setg uintptr, g uintptr) | |
| 65 | 69 | TEXT ·setg_trampoline(SB), NOSPLIT, $0-16 | |
| 66 | 70 | MOVQ G+8(FP), DI | |
| @@ -61,6 +61,10 @@ TEXT x_cgo_notify_runtime_init_done_trampoline(SB), NOSPLIT, $0 | |||||
| 61 | CALL ·x_cgo_notify_runtime_init_done(SB) | 61 | CALL ·x_cgo_notify_runtime_init_done(SB) | ||
| 62 | RET | 62 | RET | ||
| 63 | 63 | ||||
| 64 | + | TEXT x_cgo_bindm_trampoline(SB), NOSPLIT, $0 | |||
| 65 | + | CALL ·x_cgo_bindm(SB) | |||
| 66 | + | RET | |||
| 67 | + | ||||
| 64 | // func setg_trampoline(setg uintptr, g uintptr) | 68 | // func setg_trampoline(setg uintptr, g uintptr) | ||
| 65 | TEXT ·setg_trampoline(SB), NOSPLIT, $0-16 | 69 | TEXT ·setg_trampoline(SB), NOSPLIT, $0-16 | ||
| 66 | MOVQ G+8(FP), DI | 70 | MOVQ G+8(FP), DI | ||
M internal/fakecgo/trampolines_arm64.s +4 -0
| @@ -41,6 +41,10 @@ TEXT x_cgo_notify_runtime_init_done_trampoline(SB), NOSPLIT, $0-0 | |||
| 41 | 41 | CALL ·x_cgo_notify_runtime_init_done(SB) | |
| 42 | 42 | RET | |
| 43 | 43 | ||
| 44 | + | TEXT x_cgo_bindm_trampoline(SB), NOSPLIT, $0 | |
| 45 | + | CALL ·x_cgo_bindm(SB) | |
| 46 | + | RET | |
| 47 | + | ||
| 44 | 48 | // func setg_trampoline(setg uintptr, g uintptr) | |
| 45 | 49 | TEXT ·setg_trampoline(SB), NOSPLIT, $0-16 | |
| 46 | 50 | MOVD G+8(FP), R0 | |
| @@ -41,6 +41,10 @@ TEXT x_cgo_notify_runtime_init_done_trampoline(SB), NOSPLIT, $0-0 | |||||
| 41 | CALL ·x_cgo_notify_runtime_init_done(SB) | 41 | CALL ·x_cgo_notify_runtime_init_done(SB) | ||
| 42 | RET | 42 | RET | ||
| 43 | 43 | ||||
| 44 | + | TEXT x_cgo_bindm_trampoline(SB), NOSPLIT, $0 | |||
| 45 | + | CALL ·x_cgo_bindm(SB) | |||
| 46 | + | RET | |||
| 47 | + | ||||
| 44 | // func setg_trampoline(setg uintptr, g uintptr) | 48 | // func setg_trampoline(setg uintptr, g uintptr) | ||
| 45 | TEXT ·setg_trampoline(SB), NOSPLIT, $0-16 | 49 | TEXT ·setg_trampoline(SB), NOSPLIT, $0-16 | ||
| 46 | MOVD G+8(FP), R0 | 50 | MOVD G+8(FP), R0 | ||
M internal/fakecgo/trampolines_stubs.s +32 -16
| @@ -9,66 +9,82 @@ | |||
| 9 | 9 | ||
| 10 | 10 | // these stubs are here because it is not possible to go:linkname directly the C functions on darwin arm64 | |
| 11 | 11 | ||
| 12 | - | TEXT _malloc(SB), NOSPLIT, $0-0 | |
| 12 | + | TEXT _malloc(SB), NOSPLIT|NOFRAME, $0-0 | |
| 13 | 13 | JMP purego_malloc(SB) | |
| 14 | 14 | RET | |
| 15 | 15 | ||
| 16 | - | TEXT _free(SB), NOSPLIT, $0-0 | |
| 16 | + | TEXT _free(SB), NOSPLIT|NOFRAME, $0-0 | |
| 17 | 17 | JMP purego_free(SB) | |
| 18 | 18 | RET | |
| 19 | 19 | ||
| 20 | - | TEXT _setenv(SB), NOSPLIT, $0-0 | |
| 20 | + | TEXT _setenv(SB), NOSPLIT|NOFRAME, $0-0 | |
| 21 | 21 | JMP purego_setenv(SB) | |
| 22 | 22 | RET | |
| 23 | 23 | ||
| 24 | - | TEXT _unsetenv(SB), NOSPLIT, $0-0 | |
| 24 | + | TEXT _unsetenv(SB), NOSPLIT|NOFRAME, $0-0 | |
| 25 | 25 | JMP purego_unsetenv(SB) | |
| 26 | 26 | RET | |
| 27 | 27 | ||
| 28 | - | TEXT _sigfillset(SB), NOSPLIT, $0-0 | |
| 28 | + | TEXT _sigfillset(SB), NOSPLIT|NOFRAME, $0-0 | |
| 29 | 29 | JMP purego_sigfillset(SB) | |
| 30 | 30 | RET | |
| 31 | 31 | ||
| 32 | - | TEXT _nanosleep(SB), NOSPLIT, $0-0 | |
| 32 | + | TEXT _nanosleep(SB), NOSPLIT|NOFRAME, $0-0 | |
| 33 | 33 | JMP purego_nanosleep(SB) | |
| 34 | 34 | RET | |
| 35 | 35 | ||
| 36 | - | TEXT _abort(SB), NOSPLIT, $0-0 | |
| 36 | + | TEXT _abort(SB), NOSPLIT|NOFRAME, $0-0 | |
| 37 | 37 | JMP purego_abort(SB) | |
| 38 | 38 | RET | |
| 39 | 39 | ||
| 40 | - | TEXT _pthread_attr_init(SB), NOSPLIT, $0-0 | |
| 40 | + | TEXT _pthread_attr_init(SB), NOSPLIT|NOFRAME, $0-0 | |
| 41 | 41 | JMP purego_pthread_attr_init(SB) | |
| 42 | 42 | RET | |
| 43 | 43 | ||
| 44 | - | TEXT _pthread_create(SB), NOSPLIT, $0-0 | |
| 44 | + | TEXT _pthread_create(SB), NOSPLIT|NOFRAME, $0-0 | |
| 45 | 45 | JMP purego_pthread_create(SB) | |
| 46 | 46 | RET | |
| 47 | 47 | ||
| 48 | - | TEXT _pthread_detach(SB), NOSPLIT, $0-0 | |
| 48 | + | TEXT _pthread_detach(SB), NOSPLIT|NOFRAME, $0-0 | |
| 49 | 49 | JMP purego_pthread_detach(SB) | |
| 50 | 50 | RET | |
| 51 | 51 | ||
| 52 | - | TEXT _pthread_sigmask(SB), NOSPLIT, $0-0 | |
| 52 | + | TEXT _pthread_sigmask(SB), NOSPLIT|NOFRAME, $0-0 | |
| 53 | 53 | JMP purego_pthread_sigmask(SB) | |
| 54 | 54 | RET | |
| 55 | 55 | ||
| 56 | - | TEXT _pthread_self(SB), NOSPLIT, $0-0 | |
| 56 | + | TEXT _pthread_self(SB), NOSPLIT|NOFRAME, $0-0 | |
| 57 | 57 | JMP purego_pthread_self(SB) | |
| 58 | 58 | RET | |
| 59 | 59 | ||
| 60 | - | TEXT _pthread_get_stacksize_np(SB), NOSPLIT, $0-0 | |
| 60 | + | TEXT _pthread_get_stacksize_np(SB), NOSPLIT|NOFRAME, $0-0 | |
| 61 | 61 | JMP purego_pthread_get_stacksize_np(SB) | |
| 62 | 62 | RET | |
| 63 | 63 | ||
| 64 | - | TEXT _pthread_attr_getstacksize(SB), NOSPLIT, $0-0 | |
| 64 | + | TEXT _pthread_attr_getstacksize(SB), NOSPLIT|NOFRAME, $0-0 | |
| 65 | 65 | JMP purego_pthread_attr_getstacksize(SB) | |
| 66 | 66 | RET | |
| 67 | 67 | ||
| 68 | - | TEXT _pthread_attr_setstacksize(SB), NOSPLIT, $0-0 | |
| 68 | + | TEXT _pthread_attr_setstacksize(SB), NOSPLIT|NOFRAME, $0-0 | |
| 69 | 69 | JMP purego_pthread_attr_setstacksize(SB) | |
| 70 | 70 | RET | |
| 71 | 71 | ||
| 72 | - | TEXT _pthread_attr_destroy(SB), NOSPLIT, $0-0 | |
| 72 | + | TEXT _pthread_attr_destroy(SB), NOSPLIT|NOFRAME, $0-0 | |
| 73 | 73 | JMP purego_pthread_attr_destroy(SB) | |
| 74 | 74 | RET | |
| 75 | + | ||
| 76 | + | TEXT _pthread_mutex_lock(SB), NOSPLIT|NOFRAME, $0-0 | |
| 77 | + | JMP purego_pthread_mutex_lock(SB) | |
| 78 | + | RET | |
| 79 | + | ||
| 80 | + | TEXT _pthread_mutex_unlock(SB), NOSPLIT|NOFRAME, $0-0 | |
| 81 | + | JMP purego_pthread_mutex_unlock(SB) | |
| 82 | + | RET | |
| 83 | + | ||
| 84 | + | TEXT _pthread_cond_broadcast(SB), NOSPLIT|NOFRAME, $0-0 | |
| 85 | + | JMP purego_pthread_cond_broadcast(SB) | |
| 86 | + | RET | |
| 87 | + | ||
| 88 | + | TEXT _pthread_setspecific(SB), NOSPLIT|NOFRAME, $0-0 | |
| 89 | + | JMP purego_pthread_setspecific(SB) | |
| 90 | + | RET | |
| @@ -9,66 +9,82 @@ | |||||
| 9 | 9 | ||||
| 10 | // these stubs are here because it is not possible to go:linkname directly the C functions on darwin arm64 | 10 | // these stubs are here because it is not possible to go:linkname directly the C functions on darwin arm64 | ||
| 11 | 11 | ||||
| 12 | - | TEXT _malloc(SB), NOSPLIT, $0-0 | 12 | + | TEXT _malloc(SB), NOSPLIT|NOFRAME, $0-0 |
| 13 | JMP purego_malloc(SB) | 13 | JMP purego_malloc(SB) | ||
| 14 | RET | 14 | RET | ||
| 15 | 15 | ||||
| 16 | - | TEXT _free(SB), NOSPLIT, $0-0 | 16 | + | TEXT _free(SB), NOSPLIT|NOFRAME, $0-0 |
| 17 | JMP purego_free(SB) | 17 | JMP purego_free(SB) | ||
| 18 | RET | 18 | RET | ||
| 19 | 19 | ||||
| 20 | - | TEXT _setenv(SB), NOSPLIT, $0-0 | 20 | + | TEXT _setenv(SB), NOSPLIT|NOFRAME, $0-0 |
| 21 | JMP purego_setenv(SB) | 21 | JMP purego_setenv(SB) | ||
| 22 | RET | 22 | RET | ||
| 23 | 23 | ||||
| 24 | - | TEXT _unsetenv(SB), NOSPLIT, $0-0 | 24 | + | TEXT _unsetenv(SB), NOSPLIT|NOFRAME, $0-0 |
| 25 | JMP purego_unsetenv(SB) | 25 | JMP purego_unsetenv(SB) | ||
| 26 | RET | 26 | RET | ||
| 27 | 27 | ||||
| 28 | - | TEXT _sigfillset(SB), NOSPLIT, $0-0 | 28 | + | TEXT _sigfillset(SB), NOSPLIT|NOFRAME, $0-0 |
| 29 | JMP purego_sigfillset(SB) | 29 | JMP purego_sigfillset(SB) | ||
| 30 | RET | 30 | RET | ||
| 31 | 31 | ||||
| 32 | - | TEXT _nanosleep(SB), NOSPLIT, $0-0 | 32 | + | TEXT _nanosleep(SB), NOSPLIT|NOFRAME, $0-0 |
| 33 | JMP purego_nanosleep(SB) | 33 | JMP purego_nanosleep(SB) | ||
| 34 | RET | 34 | RET | ||
| 35 | 35 | ||||
| 36 | - | TEXT _abort(SB), NOSPLIT, $0-0 | 36 | + | TEXT _abort(SB), NOSPLIT|NOFRAME, $0-0 |
| 37 | JMP purego_abort(SB) | 37 | JMP purego_abort(SB) | ||
| 38 | RET | 38 | RET | ||
| 39 | 39 | ||||
| 40 | - | TEXT _pthread_attr_init(SB), NOSPLIT, $0-0 | 40 | + | TEXT _pthread_attr_init(SB), NOSPLIT|NOFRAME, $0-0 |
| 41 | JMP purego_pthread_attr_init(SB) | 41 | JMP purego_pthread_attr_init(SB) | ||
| 42 | RET | 42 | RET | ||
| 43 | 43 | ||||
| 44 | - | TEXT _pthread_create(SB), NOSPLIT, $0-0 | 44 | + | TEXT _pthread_create(SB), NOSPLIT|NOFRAME, $0-0 |
| 45 | JMP purego_pthread_create(SB) | 45 | JMP purego_pthread_create(SB) | ||
| 46 | RET | 46 | RET | ||
| 47 | 47 | ||||
| 48 | - | TEXT _pthread_detach(SB), NOSPLIT, $0-0 | 48 | + | TEXT _pthread_detach(SB), NOSPLIT|NOFRAME, $0-0 |
| 49 | JMP purego_pthread_detach(SB) | 49 | JMP purego_pthread_detach(SB) | ||
| 50 | RET | 50 | RET | ||
| 51 | 51 | ||||
| 52 | - | TEXT _pthread_sigmask(SB), NOSPLIT, $0-0 | 52 | + | TEXT _pthread_sigmask(SB), NOSPLIT|NOFRAME, $0-0 |
| 53 | JMP purego_pthread_sigmask(SB) | 53 | JMP purego_pthread_sigmask(SB) | ||
| 54 | RET | 54 | RET | ||
| 55 | 55 | ||||
| 56 | - | TEXT _pthread_self(SB), NOSPLIT, $0-0 | 56 | + | TEXT _pthread_self(SB), NOSPLIT|NOFRAME, $0-0 |
| 57 | JMP purego_pthread_self(SB) | 57 | JMP purego_pthread_self(SB) | ||
| 58 | RET | 58 | RET | ||
| 59 | 59 | ||||
| 60 | - | TEXT _pthread_get_stacksize_np(SB), NOSPLIT, $0-0 | 60 | + | TEXT _pthread_get_stacksize_np(SB), NOSPLIT|NOFRAME, $0-0 |
| 61 | JMP purego_pthread_get_stacksize_np(SB) | 61 | JMP purego_pthread_get_stacksize_np(SB) | ||
| 62 | RET | 62 | RET | ||
| 63 | 63 | ||||
| 64 | - | TEXT _pthread_attr_getstacksize(SB), NOSPLIT, $0-0 | 64 | + | TEXT _pthread_attr_getstacksize(SB), NOSPLIT|NOFRAME, $0-0 |
| 65 | JMP purego_pthread_attr_getstacksize(SB) | 65 | JMP purego_pthread_attr_getstacksize(SB) | ||
| 66 | RET | 66 | RET | ||
| 67 | 67 | ||||
| 68 | - | TEXT _pthread_attr_setstacksize(SB), NOSPLIT, $0-0 | 68 | + | TEXT _pthread_attr_setstacksize(SB), NOSPLIT|NOFRAME, $0-0 |
| 69 | JMP purego_pthread_attr_setstacksize(SB) | 69 | JMP purego_pthread_attr_setstacksize(SB) | ||
| 70 | RET | 70 | RET | ||
| 71 | 71 | ||||
| 72 | - | TEXT _pthread_attr_destroy(SB), NOSPLIT, $0-0 | 72 | + | TEXT _pthread_attr_destroy(SB), NOSPLIT|NOFRAME, $0-0 |
| 73 | JMP purego_pthread_attr_destroy(SB) | 73 | JMP purego_pthread_attr_destroy(SB) | ||
| 74 | RET | 74 | RET | ||
| 75 | + | ||||
| 76 | + | TEXT _pthread_mutex_lock(SB), NOSPLIT|NOFRAME, $0-0 | |||
| 77 | + | JMP purego_pthread_mutex_lock(SB) | |||
| 78 | + | RET | |||
| 79 | + | ||||
| 80 | + | TEXT _pthread_mutex_unlock(SB), NOSPLIT|NOFRAME, $0-0 | |||
| 81 | + | JMP purego_pthread_mutex_unlock(SB) | |||
| 82 | + | RET | |||
| 83 | + | ||||
| 84 | + | TEXT _pthread_cond_broadcast(SB), NOSPLIT|NOFRAME, $0-0 | |||
| 85 | + | JMP purego_pthread_cond_broadcast(SB) | |||
| 86 | + | RET | |||
| 87 | + | ||||
| 88 | + | TEXT _pthread_setspecific(SB), NOSPLIT|NOFRAME, $0-0 | |||
| 89 | + | JMP purego_pthread_setspecific(SB) | |||
| 90 | + | RET | |||
M sys_amd64.s +2 -2
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | // C calling convention (use libcCall). | |
| 30 | 30 | GLOBL ·syscall9XABI0(SB), NOPTR|RODATA, $8 | |
| 31 | 31 | DATA ·syscall9XABI0(SB)/8, $syscall9X(SB) | |
| 32 | - | TEXT syscall9X(SB), NOSPLIT, $0 | |
| 32 | + | TEXT syscall9X(SB), NOSPLIT|NOFRAME, $0 | |
| 33 | 33 | PUSHQ BP | |
| 34 | 34 | MOVQ SP, BP | |
| 35 | 35 | SUBQ $32, SP | |
| @@ -73,7 +73,7 @@ TEXT syscall9X(SB), NOSPLIT, $0 | |||
| 73 | 73 | POPQ BP | |
| 74 | 74 | RET | |
| 75 | 75 | ||
| 76 | - | TEXT callbackasm1(SB), NOSPLIT, $0 | |
| 76 | + | TEXT callbackasm1(SB), NOSPLIT|NOFRAME, $0 | |
| 77 | 77 | // remove return address from stack, we are not returning to callbackasm, but to its caller. | |
| 78 | 78 | MOVQ 0(SP), AX | |
| 79 | 79 | ADDQ $8, SP | |
| @@ -29,7 +29,7 @@ | |||||
| 29 | // C calling convention (use libcCall). | 29 | // C calling convention (use libcCall). | ||
| 30 | GLOBL ·syscall9XABI0(SB), NOPTR|RODATA, $8 | 30 | GLOBL ·syscall9XABI0(SB), NOPTR|RODATA, $8 | ||
| 31 | DATA ·syscall9XABI0(SB)/8, $syscall9X(SB) | 31 | DATA ·syscall9XABI0(SB)/8, $syscall9X(SB) | ||
| 32 | - | TEXT syscall9X(SB), NOSPLIT, $0 | 32 | + | TEXT syscall9X(SB), NOSPLIT|NOFRAME, $0 |
| 33 | PUSHQ BP | 33 | PUSHQ BP | ||
| 34 | MOVQ SP, BP | 34 | MOVQ SP, BP | ||
| 35 | SUBQ $32, SP | 35 | SUBQ $32, SP | ||
| @@ -73,7 +73,7 @@ TEXT syscall9X(SB), NOSPLIT, $0 | |||||
| 73 | POPQ BP | 73 | POPQ BP | ||
| 74 | RET | 74 | RET | ||
| 75 | 75 | ||||
| 76 | - | TEXT callbackasm1(SB), NOSPLIT, $0 | 76 | + | TEXT callbackasm1(SB), NOSPLIT|NOFRAME, $0 |
| 77 | // remove return address from stack, we are not returning to callbackasm, but to its caller. | 77 | // remove return address from stack, we are not returning to callbackasm, but to its caller. | ||
| 78 | MOVQ 0(SP), AX | 78 | MOVQ 0(SP), AX | ||
| 79 | ADDQ $8, SP | 79 | ADDQ $8, SP | ||
M syscall_sysv.go +5 -2
| @@ -117,8 +117,11 @@ const ptrSize = unsafe.Sizeof((*int)(nil)) | |||
| 117 | 117 | ||
| 118 | 118 | const callbackMaxFrame = 64 * ptrSize | |
| 119 | 119 | ||
| 120 | - | // callbackasmABI0 is implemented in zcallback_GOOS_GOARCH.s | |
| 121 | - | var callbackasmABI0 uintptr | |
| 120 | + | // callbackasm is implemented in zcallback_GOOS_GOARCH.s | |
| 121 | + | // | |
| 122 | + | //go:linkname __callbackasm callbackasm | |
| 123 | + | var __callbackasm byte | |
| 124 | + | var callbackasmABI0 = uintptr(unsafe.Pointer(&__callbackasm)) | |
| 122 | 125 | ||
| 123 | 126 | // callbackWrap_call allows the calling of the ABIInternal wrapper | |
| 124 | 127 | // which is required for runtime.cgocallback without the | |
| @@ -117,8 +117,11 @@ const ptrSize = unsafe.Sizeof((*int)(nil)) | |||||
| 117 | 117 | ||||
| 118 | const callbackMaxFrame = 64 * ptrSize | 118 | const callbackMaxFrame = 64 * ptrSize | ||
| 119 | 119 | ||||
| 120 | - | // callbackasmABI0 is implemented in zcallback_GOOS_GOARCH.s | 120 | + | // callbackasm is implemented in zcallback_GOOS_GOARCH.s |
| 121 | - | var callbackasmABI0 uintptr | 121 | + | // |
| 122 | + | //go:linkname __callbackasm callbackasm | |||
| 123 | + | var __callbackasm byte | |||
| 124 | + | var callbackasmABI0 = uintptr(unsafe.Pointer(&__callbackasm)) | |||
| 122 | 125 | ||||
| 123 | // callbackWrap_call allows the calling of the ABIInternal wrapper | 126 | // callbackWrap_call allows the calling of the ABIInternal wrapper | ||
| 124 | // which is required for runtime.cgocallback without the | 127 | // which is required for runtime.cgocallback without the | ||
M zcallback_amd64.s +1 -3
| @@ -11,9 +11,7 @@ | |||
| 11 | 11 | // which Go callback function is executed later on. | |
| 12 | 12 | #include "textflag.h" | |
| 13 | 13 | ||
| 14 | - | GLOBL ·callbackasmABI0(SB), NOPTR|RODATA, $8 | |
| 15 | - | DATA ·callbackasmABI0(SB)/8, $callbackasm(SB) | |
| 16 | - | TEXT callbackasm(SB), 7, $0 | |
| 14 | + | TEXT callbackasm(SB), NOSPLIT|NOFRAME, $0 | |
| 17 | 15 | CALL callbackasm1(SB) | |
| 18 | 16 | CALL callbackasm1(SB) | |
| 19 | 17 | CALL callbackasm1(SB) | |
| @@ -11,9 +11,7 @@ | |||||
| 11 | // which Go callback function is executed later on. | 11 | // which Go callback function is executed later on. | ||
| 12 | #include "textflag.h" | 12 | #include "textflag.h" | ||
| 13 | 13 | ||||
| 14 | - | GLOBL ·callbackasmABI0(SB), NOPTR|RODATA, $8 | 14 | + | TEXT callbackasm(SB), NOSPLIT|NOFRAME, $0 |
| 15 | - | DATA ·callbackasmABI0(SB)/8, $callbackasm(SB) | |||
| 16 | - | TEXT callbackasm(SB), 7, $0 | |||
| 17 | CALL callbackasm1(SB) | 15 | CALL callbackasm1(SB) | ||
| 18 | CALL callbackasm1(SB) | 16 | CALL callbackasm1(SB) | ||
| 19 | CALL callbackasm1(SB) | 17 | CALL callbackasm1(SB) | ||
M zcallback_arm64.s +0 -2
| @@ -11,8 +11,6 @@ | |||
| 11 | 11 | // It then calls the Go implementation for that callback. | |
| 12 | 12 | #include "textflag.h" | |
| 13 | 13 | ||
| 14 | - | GLOBL ·callbackasmABI0(SB), NOPTR|RODATA, $8 | |
| 15 | - | DATA ·callbackasmABI0(SB)/8, $callbackasm(SB) | |
| 16 | 14 | TEXT callbackasm(SB), NOSPLIT|NOFRAME, $0 | |
| 17 | 15 | MOVD $0, R12 | |
| 18 | 16 | B callbackasm1(SB) | |
| @@ -11,8 +11,6 @@ | |||||
| 11 | // It then calls the Go implementation for that callback. | 11 | // It then calls the Go implementation for that callback. | ||
| 12 | #include "textflag.h" | 12 | #include "textflag.h" | ||
| 13 | 13 | ||||
| 14 | - | GLOBL ·callbackasmABI0(SB), NOPTR|RODATA, $8 | |||
| 15 | - | DATA ·callbackasmABI0(SB)/8, $callbackasm(SB) | |||
| 16 | TEXT callbackasm(SB), NOSPLIT|NOFRAME, $0 | 14 | TEXT callbackasm(SB), NOSPLIT|NOFRAME, $0 | ||
| 17 | MOVD $0, R12 | 15 | MOVD $0, R12 | ||
| 18 | B callbackasm1(SB) | 16 | B callbackasm1(SB) | ||