From 4afc81056660b7f70d286d3bf7122ec23ac4ac23 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Mon, 4 Aug 2008 17:17:59 -0700 Subject: - switched most of existing Go code to new export syntax - adjusted lang doc R=r DELTA=192 (26 added, 65 deleted, 101 changed) OCL=13844 CL=13848 --- src/syscall/file_amd64_darwin.go | 44 ++++++++++++++-------------------------- src/syscall/file_amd64_linux.go | 44 ++++++++++++++-------------------------- src/syscall/syscall.go | 8 ++------ 3 files changed, 32 insertions(+), 64 deletions(-) (limited to 'src/syscall') diff --git a/src/syscall/file_amd64_darwin.go b/src/syscall/file_amd64_darwin.go index 97017e5d3..58cf6e93b 100644 --- a/src/syscall/file_amd64_darwin.go +++ b/src/syscall/file_amd64_darwin.go @@ -8,10 +8,10 @@ package syscall import syscall "syscall" -export Stat -export stat, fstat, lstat -export open, creat, close, read, write, pipe -export unlink +//export Stat +//export stat, fstat, lstat +//export open, creat, close, read, write, pipe +//export unlink func StatToInt(s *Stat) int64; @@ -31,7 +31,7 @@ type Timespec struct { tv_nsec int64; } -type Stat struct { +export type Stat struct { st_dev dev_t; /* ID of device containing file */ st_mode mode_t; /* protection */ st_nlink nlink_t; /* number of hard links */ @@ -65,51 +65,37 @@ const ( O_TRUNC = 0x400; ) -export ( - O_RDONLY, - O_WRONLY, - O_RDWR, - O_APPEND, - O_ASYNC, - O_CREAT, - O_NOCTTY, - O_NONBLOCK, - O_NDELAY, - O_SYNC, - O_TRUNC -) - -func open(name *byte, mode int64, flags int64) (ret int64, errno int64) { +export func open(name *byte, mode int64, flags int64) (ret int64, errno int64) { const SYSOPEN = 5; r1, r2, err := syscall.Syscall(SYSOPEN, AddrToInt(name), mode, flags); return r1, err; } -func creat(name *byte, mode int64) (ret int64, errno int64) { +export func creat(name *byte, mode int64) (ret int64, errno int64) { const SYSOPEN = 5; r1, r2, err := syscall.Syscall(SYSOPEN, AddrToInt(name), mode, O_CREAT|O_WRONLY|O_TRUNC); return r1, err; } -func close(fd int64) (ret int64, errno int64) { +export func close(fd int64) (ret int64, errno int64) { const SYSCLOSE = 6; r1, r2, err := syscall.Syscall(SYSCLOSE, fd, 0, 0); return r1, err; } -func read(fd int64, buf *byte, nbytes int64) (ret int64, errno int64) { +export func read(fd int64, buf *byte, nbytes int64) (ret int64, errno int64) { const SYSREAD = 3; r1, r2, err := syscall.Syscall(SYSREAD, fd, AddrToInt(buf), nbytes); return r1, err; } -func write(fd int64, buf *byte, nbytes int64) (ret int64, errno int64) { +export func write(fd int64, buf *byte, nbytes int64) (ret int64, errno int64) { const SYSWRITE = 4; r1, r2, err := syscall.Syscall(SYSWRITE, fd, AddrToInt(buf), nbytes); return r1, err; } -func pipe(fds *[2]int64) (ret int64, errno int64) { +export func pipe(fds *[2]int64) (ret int64, errno int64) { const SYSPIPE = 42; r1, r2, err := syscall.Syscall(SYSPIPE, 0, 0, 0); if r1 < 0 { @@ -120,25 +106,25 @@ func pipe(fds *[2]int64) (ret int64, errno int64) { return 0, 0; } -func stat(name *byte, buf *Stat) (ret int64, errno int64) { +export func stat(name *byte, buf *Stat) (ret int64, errno int64) { const SYSSTAT = 338; r1, r2, err := syscall.Syscall(SYSSTAT, AddrToInt(name), StatToInt(buf), 0); return r1, err; } -func lstat(name *byte, buf *Stat) (ret int64, errno int64) { +export func lstat(name *byte, buf *Stat) (ret int64, errno int64) { const SYSLSTAT = 340; r1, r2, err := syscall.Syscall(SYSLSTAT, AddrToInt(name), StatToInt(buf), 0); return r1, err; } -func fstat(fd int64, buf *Stat) (ret int64, errno int64) { +export func fstat(fd int64, buf *Stat) (ret int64, errno int64) { const SYSFSTAT = 339; r1, r2, err := syscall.Syscall(SYSFSTAT, fd, StatToInt(buf), 0); return r1, err; } -func unlink(name *byte) (ret int64, errno int64) { +export func unlink(name *byte) (ret int64, errno int64) { const SYSUNLINK = 10; r1, r2, err := syscall.Syscall(SYSUNLINK, AddrToInt(name), 0, 0); return r1, err; diff --git a/src/syscall/file_amd64_linux.go b/src/syscall/file_amd64_linux.go index dc600b8c3..d00222a26 100644 --- a/src/syscall/file_amd64_linux.go +++ b/src/syscall/file_amd64_linux.go @@ -8,10 +8,10 @@ package syscall import syscall "syscall" -export Stat -export stat, fstat, lstat -export open, creat, close, read, write, pipe -export unlink +//export Stat +//export stat, fstat, lstat +//export open, creat, close, read, write, pipe +//export unlink func StatToInt(s *Stat) int64; func Addr32ToInt(s *int32) int64; @@ -32,7 +32,7 @@ type Timespec struct { tv_nsec int64; } -type Stat struct { +export type Stat struct { st_dev dev_t; /* ID of device containing file */ st_ino ino_t; /* inode number */ st_nlink nlink_t; /* number of hard links */ @@ -66,51 +66,37 @@ const ( O_TRUNC = 0x200; ) -export ( - O_RDONLY, - O_WRONLY, - O_RDWR, - O_APPEND, - O_ASYNC, - O_CREAT, - O_NOCTTY, - O_NONBLOCK, - O_NDELAY, - O_SYNC, - O_TRUNC -) - -func open(name *byte, mode int64, flags int64) (ret int64, errno int64) { +export func open(name *byte, mode int64, flags int64) (ret int64, errno int64) { const SYSOPEN = 2; r1, r2, err := syscall.Syscall(SYSOPEN, AddrToInt(name), mode, flags); return r1, err; } -func creat(name *byte, mode int64) (ret int64, errno int64) { +export func creat(name *byte, mode int64) (ret int64, errno int64) { const SYSOPEN = 2; r1, r2, err := syscall.Syscall(SYSOPEN, AddrToInt(name), mode, O_CREAT|O_WRONLY|O_TRUNC); return r1, err; } -func close(fd int64) (ret int64, errno int64) { +export func close(fd int64) (ret int64, errno int64) { const SYSCLOSE = 3; r1, r2, err := syscall.Syscall(SYSCLOSE, fd, 0, 0); return r1, err; } -func read(fd int64, buf *byte, nbytes int64) (ret int64, errno int64) { +export func read(fd int64, buf *byte, nbytes int64) (ret int64, errno int64) { const SYSREAD = 0; r1, r2, err := syscall.Syscall(SYSREAD, fd, AddrToInt(buf), nbytes); return r1, err; } -func write(fd int64, buf *byte, nbytes int64) (ret int64, errno int64) { +export func write(fd int64, buf *byte, nbytes int64) (ret int64, errno int64) { const SYSWRITE = 1; r1, r2, err := syscall.Syscall(SYSWRITE, fd, AddrToInt(buf), nbytes); return r1, err; } -func pipe(fds *[2]int64) (ret int64, errno int64) { +export func pipe(fds *[2]int64) (ret int64, errno int64) { const SYSPIPE = 22; var t [2] int32; r1, r2, err := syscall.Syscall(SYSPIPE, Addr32ToInt(&t[0]), 0, 0); @@ -122,25 +108,25 @@ func pipe(fds *[2]int64) (ret int64, errno int64) { return 0, 0; } -func stat(name *byte, buf *Stat) (ret int64, errno int64) { +export func stat(name *byte, buf *Stat) (ret int64, errno int64) { const SYSSTAT = 4; r1, r2, err := syscall.Syscall(SYSSTAT, AddrToInt(name), StatToInt(buf), 0); return r1, err; } -func lstat(name *byte, buf *Stat) (ret int64, errno int64) { +export func lstat(name *byte, buf *Stat) (ret int64, errno int64) { const SYSLSTAT = 6; r1, r2, err := syscall.Syscall(SYSLSTAT, AddrToInt(name), StatToInt(buf), 0); return r1, err; } -func fstat(fd int64, buf *Stat) (ret int64, errno int64) { +export func fstat(fd int64, buf *Stat) (ret int64, errno int64) { const SYSFSTAT = 5; r1, r2, err := syscall.Syscall(SYSFSTAT, fd, StatToInt(buf), 0); return r1, err; } -func unlink(name *byte) (ret int64, errno int64) { +export func unlink(name *byte) (ret int64, errno int64) { const SYSUNLINK = 87; r1, r2, err := syscall.Syscall(SYSUNLINK, AddrToInt(name), 0, 0); return r1, err; diff --git a/src/syscall/syscall.go b/src/syscall/syscall.go index 8475001a7..7f31c11c9 100644 --- a/src/syscall/syscall.go +++ b/src/syscall/syscall.go @@ -8,10 +8,6 @@ package syscall * Foundation of system call interface. */ -func Syscall(trap int64, a1, a2, a3 int64) (r1, r2, err int64); -func AddrToInt(b *byte) int64; - -export Syscall -export AddrToInt - +export func Syscall(trap int64, a1, a2, a3 int64) (r1, r2, err int64); +export func AddrToInt(b *byte) int64; -- cgit v1.2.1