runtime: rename cgocall_errno and asmcgocall_errno into cgocall and asmcgocall

Change-Id: I5917bea8bb35b0e725dcc56a68f3a70137cfc180
Reviewed-on: https://go-review.googlesource.com/9387
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Alex Brainman 2015-04-27 17:32:23 +10:00
parent 1a040c9230
commit 9d968cb47b
20 changed files with 87 additions and 103 deletions

View file

@ -34,7 +34,7 @@ func syscall_sysvicall6(fn, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err
args: uintptr(unsafe.Pointer(&a1)),
}
entersyscallblock(0)
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
exitsyscall(0)
return call.r1, call.r2, call.err
}
@ -46,7 +46,7 @@ func syscall_rawsysvicall6(fn, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, e
n: nargs,
args: uintptr(unsafe.Pointer(&a1)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.r1, call.r2, call.err
}
@ -61,7 +61,7 @@ func syscall_chdir(path uintptr) (err uintptr) {
n: 1,
args: uintptr(unsafe.Pointer(&path)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.err
}
@ -72,7 +72,7 @@ func syscall_chroot(path uintptr) (err uintptr) {
n: 1,
args: uintptr(unsafe.Pointer(&path)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.err
}
@ -89,7 +89,7 @@ func syscall_execve(path, argv, envp uintptr) (err uintptr) {
n: 3,
args: uintptr(unsafe.Pointer(&path)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.err
}
@ -106,7 +106,7 @@ func syscall_fcntl(fd, cmd, arg uintptr) (val, err uintptr) {
n: 3,
args: uintptr(unsafe.Pointer(&fd)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.r1, call.err
}
@ -117,7 +117,7 @@ func syscall_forkx(flags uintptr) (pid uintptr, err uintptr) {
n: 1,
args: uintptr(unsafe.Pointer(&flags)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.r1, call.err
}
@ -130,7 +130,7 @@ func syscall_gethostname() (name string, err uintptr) {
args: uintptr(unsafe.Pointer(&args[0])),
}
entersyscallblock(0)
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
exitsyscall(0)
if call.r1 != 0 {
return "", call.err
@ -146,7 +146,7 @@ func syscall_getpid() (pid, err uintptr) {
n: 0,
args: uintptr(unsafe.Pointer(&libc_getpid)), // it's unused but must be non-nil, otherwise crashes
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.r1, call.err
}
@ -157,7 +157,7 @@ func syscall_ioctl(fd, req, arg uintptr) (err uintptr) {
n: 3,
args: uintptr(unsafe.Pointer(&fd)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.err
}
@ -168,7 +168,7 @@ func syscall_pipe() (r, w, err uintptr) {
args: uintptr(unsafe.Pointer(&pipe1)), // it's unused but must be non-nil, otherwise crashes
}
entersyscallblock(0)
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
exitsyscall(0)
return call.r1, call.r2, call.err
}
@ -185,7 +185,7 @@ func syscall_rawsyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr) {
n: 4,
args: uintptr(unsafe.Pointer(&trap)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.r1, call.r2, call.err
}
@ -196,7 +196,7 @@ func syscall_setgid(gid uintptr) (err uintptr) {
n: 1,
args: uintptr(unsafe.Pointer(&gid)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.err
}
@ -207,7 +207,7 @@ func syscall_setgroups(ngid, gid uintptr) (err uintptr) {
n: 2,
args: uintptr(unsafe.Pointer(&ngid)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.err
}
@ -218,7 +218,7 @@ func syscall_setsid() (pid, err uintptr) {
n: 0,
args: uintptr(unsafe.Pointer(&libc_setsid)), // it's unused but must be non-nil, otherwise crashes
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.r1, call.err
}
@ -229,7 +229,7 @@ func syscall_setuid(uid uintptr) (err uintptr) {
n: 1,
args: uintptr(unsafe.Pointer(&uid)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.err
}
@ -240,7 +240,7 @@ func syscall_setpgid(pid, pgid uintptr) (err uintptr) {
n: 2,
args: uintptr(unsafe.Pointer(&pid)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.err
}
@ -257,7 +257,7 @@ func syscall_syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr) {
args: uintptr(unsafe.Pointer(&trap)),
}
entersyscallblock(0)
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
exitsyscall(0)
return call.r1, call.r2, call.err
}
@ -269,7 +269,7 @@ func syscall_wait4(pid uintptr, wstatus *uint32, options uintptr, rusage unsafe.
args: uintptr(unsafe.Pointer(&pid)),
}
entersyscallblock(0)
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
exitsyscall(0)
return int(call.r1), call.err
}
@ -281,6 +281,6 @@ func syscall_write(fd, buf, nbyte uintptr) (n, err uintptr) {
n: 3,
args: uintptr(unsafe.Pointer(&fd)),
}
asmcgocall_errno(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
asmcgocall(unsafe.Pointer(&asmsysvicall6), unsafe.Pointer(&call))
return call.r1, call.err
}