@@ -18,13 +18,12 @@
func libc_syscall32(trap int32, a1, a2, a3, a4, a5, a6 int32) int32 __asm__ ("syscall");
func libc_syscall64(trap int64, a1, a2, a3, a4, a5, a6 int64) int64 __asm__ ("syscall");
-// Do a system call. We look at the size of int to see how to pass
+// Do a system call. We look at the size of uintptr to see how to pass
// the arguments, so that we don't pass a 64-bit value when the function
// expects a 32-bit one.
func Syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr) {
var r uintptr;
- var i int;
- if unsafe.Sizeof(i) == 4 {
+ if unsafe.Sizeof(r) == 4 {
r1 := libc_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), 0, 0, 0);
r = uintptr(r1);
} else {
@@ -36,8 +35,7 @@
func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr) {
var r uintptr;
- var i int;
- if unsafe.Sizeof(i) == 4 {
+ if unsafe.Sizeof(r) == 4 {
r1 := libc_syscall32(int32(trap), int32(a1), int32(a2), int32(a3),
int32(a4), int32(a5), int32(a6));
r = uintptr(r1);