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>
diff --git a/src/runtime/syscall_solaris.go b/src/runtime/syscall_solaris.go
index e69745c..ae1f334 100644
--- a/src/runtime/syscall_solaris.go
+++ b/src/runtime/syscall_solaris.go
@@ -34,7 +34,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
}