Skip to content

Commit 1de1c0d

Browse files
committed
syscall: move Syscall declarations to OS files
Future CLs will be changing the provenance of these functions. Move the declarations to the individual OS files now so that future CLs can change only 1 OS at a time rather than changing all at once. For #51087 Change-Id: I5e1bca71e670263d8c0faa586c1b6b4de1a114b6 Reviewed-on: https://go-review.googlesource.com/c/go/+/388474 Run-TryBot: Michael Pratt <[email protected]> Reviewed-by: Cherry Mui <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent 342b495 commit 1de1c0d

9 files changed

+42
-9
lines changed

src/syscall/syscall_aix.go

+5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ import (
1515
"unsafe"
1616
)
1717

18+
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
19+
func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
20+
func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
21+
func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
22+
1823
// Implemented in runtime/syscall_aix.go.
1924
func rawSyscall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
2025
func syscall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)

src/syscall/syscall_darwin.go

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ import (
1717
"unsafe"
1818
)
1919

20+
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
21+
func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
22+
func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
23+
func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
24+
2025
var dupTrampoline = abi.FuncPCABI0(libc_dup2_trampoline)
2126

2227
type SockaddrDatalink struct {

src/syscall/syscall_dragonfly.go

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ import (
1717
"unsafe"
1818
)
1919

20+
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
21+
func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
22+
func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
23+
func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
24+
2025
const _SYS_DUP3 = 0
2126

2227
// See version list in https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/sys/sys/param.h

src/syscall/syscall_freebsd.go

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ import (
1717
"unsafe"
1818
)
1919

20+
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
21+
func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
22+
func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
23+
func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
24+
2025
const (
2126
_SYS_FSTAT_FREEBSD12 = 551 // { int fstat(int fd, _Out_ struct stat *sb); }
2227
_SYS_FSTATAT_FREEBSD12 = 552 // { int fstatat(int fd, _In_z_ char *path, _Out_ struct stat *buf, int flag); }

src/syscall/syscall_linux.go

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ import (
1616
"unsafe"
1717
)
1818

19+
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
20+
func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
21+
func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
22+
func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
23+
1924
func rawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr)
2025

2126
/*

src/syscall/syscall_netbsd.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ package syscall
1414

1515
import "unsafe"
1616

17+
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
18+
func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
19+
func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err Errno)
20+
func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
21+
func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
22+
1723
const _SYS_DUP3 = SYS_DUP3
1824

1925
type SockaddrDatalink struct {
@@ -28,8 +34,6 @@ type SockaddrDatalink struct {
2834
raw RawSockaddrDatalink
2935
}
3036

31-
func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err Errno)
32-
3337
func sysctlNodes(mib []_C_int) (nodes []Sysctlnode, err error) {
3438
var olen uintptr
3539

src/syscall/syscall_openbsd.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ package syscall
1414

1515
import "unsafe"
1616

17+
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
18+
func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
19+
func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err Errno)
20+
func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
21+
func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
22+
1723
type SockaddrDatalink struct {
1824
Len uint8
1925
Family uint8
@@ -26,8 +32,6 @@ type SockaddrDatalink struct {
2632
raw RawSockaddrDatalink
2733
}
2834

29-
func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err Errno)
30-
3135
func nametomib(name string) (mib []_C_int, err error) {
3236
// Perform lookup via a binary search
3337
left := 0

src/syscall/syscall_solaris.go

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ package syscall
1414

1515
import "unsafe"
1616

17+
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
18+
func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
19+
func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
20+
func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
21+
1722
const _F_DUP2FD_CLOEXEC = F_DUP2FD_CLOEXEC
1823

1924
// Implemented in asm_solaris_amd64.s.

src/syscall/syscall_unix.go

-5
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ const (
2828
netbsd32Bit = runtime.GOOS == "netbsd" && sizeofPtr == 4
2929
)
3030

31-
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
32-
func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
33-
func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno)
34-
func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno)
35-
3631
// clen returns the index of the first NULL byte in n or len(n) if n contains no NULL byte.
3732
func clen(n []byte) int {
3833
if i := bytealg.IndexByte(n, 0); i != -1 {

0 commit comments

Comments
 (0)