runtime: wrap nanotime, walltime, and write

In preparation for general faketime support, this renames the existing
nanotime, walltime, and write functions to nanotime1, walltime1, and
write1 and wraps them with trivial Go functions. This will let us
inject different implementations on all platforms when faketime is
enabled.

Updates #30439.

Change-Id: Ice5ccc513a32a6d89ea051638676d3ee05b00418
Reviewed-on: https://go-review.googlesource.com/c/go/+/192738
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/misc/wasm/wasm_exec.js b/misc/wasm/wasm_exec.js
index 7341e755e71e9fab7d64176e0d65bf3d5ea9f65d..1e1ba636cadbc06f1f7a75483a33536a4c94d45b 100644 (file)
--- a/misc/wasm/wasm_exec.js
+++ b/misc/wasm/wasm_exec.js
@@ -248,13 +248,13 @@
                                                this.mem = new DataView(this._inst.exports.mem.buffer);
                                        },
 
-                                       // func nanotime() int64
-                                       "runtime.nanotime": (sp) => {
+                                       // func nanotime1() int64
+                                       "runtime.nanotime1": (sp) => {
                                                setInt64(sp + 8, (timeOrigin + performance.now()) * 1000000);
                                        },
 
-                                       // func walltime() (sec int64, nsec int32)
-                                       "runtime.walltime": (sp) => {
+                                       // func walltime1() (sec int64, nsec int32)
+                                       "runtime.walltime1": (sp) => {
                                                const msec = (new Date).getTime();
                                                setInt64(sp + 8, msec / 1000);
                                                this.mem.setInt32(sp + 16, (msec % 1000) * 1000000, true);

diff --git a/src/runtime/os2_aix.go b/src/runtime/os2_aix.go
index 162d93ef5226fcc552c04cb976f84f1c8b7865ef..d9b94d438c2f8e1a067f85fa5d7212cf3f180eba 100644 (file)
--- a/src/runtime/os2_aix.go
+++ b/src/runtime/os2_aix.go
@@ -390,10 +390,10 @@ func exit(code int32) {
        exit1(code)
 }
 
-func write1(fd, p uintptr, n int32) int32
+func write2(fd, p uintptr, n int32) int32
 
 //go:nosplit
-func write(fd uintptr, p unsafe.Pointer, n int32) int32 {
+func write1(fd uintptr, p unsafe.Pointer, n int32) int32 {
        _g_ := getg()
 
        // Check the validity of g because without a g during
@@ -402,7 +402,7 @@ func write(fd uintptr, p unsafe.Pointer, n int32) int32 {
                r, _ := syscall3(&libc_write, uintptr(fd), uintptr(p), uintptr(n))
                return int32(r)
        }
-       return write1(fd, uintptr(p), n)
+       return write2(fd, uintptr(p), n)
 
 }
 

diff --git a/src/runtime/os3_solaris.go b/src/runtime/os3_solaris.go
index b5a11e8f5134d64c466107e567b74177f6367656..afda44295b236822331f1aa02f65aac0e3a52d44 100644 (file)
--- a/src/runtime/os3_solaris.go
+++ b/src/runtime/os3_solaris.go
@@ -393,11 +393,11 @@ func munmap(addr unsafe.Pointer, n uintptr) {
        sysvicall2(&libc_munmap, uintptr(addr), uintptr(n))
 }
 
-func nanotime1()
+func nanotime2()
 
 //go:nosplit
-func nanotime() int64 {
-       return int64(sysvicall0((*libcFunc)(unsafe.Pointer(funcPC(nanotime1)))))
+func nanotime1() int64 {
+       return int64(sysvicall0((*libcFunc)(unsafe.Pointer(funcPC(nanotime2)))))
 }
 
 //go:nosplit
@@ -499,7 +499,7 @@ func usleep(µs uint32) {
 }
 
 //go:nosplit
-func write(fd uintptr, buf unsafe.Pointer, nbyte int32) int32 {
+func write1(fd uintptr, buf unsafe.Pointer, nbyte int32) int32 {
        return int32(sysvicall3(&libc_write, uintptr(fd), uintptr(buf), uintptr(nbyte)))
 }
 

diff --git a/src/runtime/os_aix.go b/src/runtime/os_aix.go
index 197869f9897b51ab013b89f35d4bf2107bf3771e..84d86e5ff1207979d0b2fec30887cad6ce8748ad 100644 (file)
--- a/src/runtime/os_aix.go
+++ b/src/runtime/os_aix.go
@@ -323,7 +323,7 @@ const (
 )
 
 //go:nosplit
-func nanotime() int64 {
+func nanotime1() int64 {
        tp := &timespec{}
        if clock_gettime(_CLOCK_REALTIME, tp) != 0 {
                throw("syscall clock_gettime failed")
@@ -331,7 +331,7 @@ func nanotime() int64 {
        return tp.tv_sec*1000000000 + tp.tv_nsec
 }
 
-func walltime() (sec int64, nsec int32) {
+func walltime1() (sec int64, nsec int32) {
        ts := &timespec{}
        if clock_gettime(_CLOCK_REALTIME, ts) != 0 {
                throw("syscall clock_gettime failed")

diff --git a/src/runtime/os_js.go b/src/runtime/os_js.go
index ad6db18b74793287023a9ddfd692253f236f60c2..9c84f1a83e1aff2746e3705c7d921dcc2a996873 100644 (file)
--- a/src/runtime/os_js.go
+++ b/src/runtime/os_js.go
@@ -12,7 +12,7 @@ import (
 
 func exit(code int32)
 
-func write(fd uintptr, p unsafe.Pointer, n int32) int32 {
+func write1(fd uintptr, p unsafe.Pointer, n int32) int32 {
        if fd > 2 {
                throw("runtime.write to fd > 2 is unsupported")
        }

diff --git a/src/runtime/os_nacl.go b/src/runtime/os_nacl.go
index 2b9a1cf6a5951da0e4ab42e98db9e0bcae79e634..e82bae78d3bf726050e512d623f8983b95e6c521 100644 (file)
--- a/src/runtime/os_nacl.go
+++ b/src/runtime/os_nacl.go
@@ -300,6 +300,8 @@ var lastfaketime int64
 // but the timestamp must increase if the fd changes.
 var lastfaketimefd int32
 
+func walltime() (sec int64, nsec int32)
+
 /*
 An attempt at IRT. Doesn't work. See end of sys_nacl_amd64.s.
 

diff --git a/src/runtime/os_plan9.go b/src/runtime/os_plan9.go
index d7ea1ef84190646e076fcb25171c9bf743bc32b5..2f8d0a0c8eafff5c6c6e3a3cb5ccf12c17fa5798 100644 (file)
--- a/src/runtime/os_plan9.go
+++ b/src/runtime/os_plan9.go
@@ -328,7 +328,7 @@ func usleep(µs uint32) {
 }
 
 //go:nosplit
-func nanotime() int64 {
+func nanotime1() int64 {
        var scratch int64
        ns := nsec(&scratch)
        // TODO(aram): remove hack after I fix _nsec in the pc64 kernel.
@@ -373,7 +373,7 @@ func postnote(pid uint64, msg []byte) int {
                return -1
        }
        len := findnull(&msg[0])
-       if write(uintptr(fd), unsafe.Pointer(&msg[0]), int32(len)) != int64(len) {
+       if write1(uintptr(fd), unsafe.Pointer(&msg[0]), int32(len)) != int32(len) {
                closefd(fd)
                return -1
        }
@@ -451,8 +451,8 @@ func read(fd int32, buf unsafe.Pointer, n int32) int32 {
 }
 
 //go:nosplit
-func write(fd uintptr, buf unsafe.Pointer, n int32) int64 {
-       return int64(pwrite(int32(fd), buf, n, -1))
+func write1(fd uintptr, buf unsafe.Pointer, n int32) int32 {
+       return pwrite(int32(fd), buf, n, -1)
 }
 
 var _badsignal = []byte("runtime: signal received on thread not created by Go.\n")

diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
index cd9e98914c54c5e7097e07330d34fc9e1e39bede..d5af836f4e33f06fec11d7fef9960a31b3e03361 100644 (file)
--- a/src/runtime/os_windows.go
+++ b/src/runtime/os_windows.go
@@ -416,8 +416,6 @@ func osinit() {
        stdcall2(_SetProcessPriorityBoost, currentProcess, 1)
 }
 
-func nanotime() int64
-
 // useQPCTime controls whether time.now and nanotime use QueryPerformanceCounter.
 // This is only set to 1 when running under Wine.
 var useQPCTime uint8
@@ -542,8 +540,12 @@ func exit(code int32) {
        stdcall1(_ExitProcess, uintptr(code))
 }
 
+// write1 must be nosplit because it's used as a last resort in
+// functions like badmorestackg0. In such cases, we'll always take the
+// ASCII path.
+//
 //go:nosplit
-func write(fd uintptr, buf unsafe.Pointer, n int32) int32 {
+func write1(fd uintptr, buf unsafe.Pointer, n int32) int32 {
        const (
                _STD_OUTPUT_HANDLE = ^uintptr(10) // -11
                _STD_ERROR_HANDLE  = ^uintptr(11) // -12
@@ -640,6 +642,9 @@ func writeConsoleUTF16(handle uintptr, b []uint16) {
        return
 }
 
+// walltime1 isn't implemented on Windows, but will never be called.
+func walltime1() (sec int64, nsec int32)
+
 //go:nosplit
 func semasleep(ns int64) int32 {
        const (

diff --git a/src/runtime/stubs2.go b/src/runtime/stubs2.go
index 57134f7354ad1429b4d4f3107b232f84db92e45e..77513386b7dcf0f75a1e544d6b8433428fd29d1f 100644 (file)
--- a/src/runtime/stubs2.go
+++ b/src/runtime/stubs2.go
@@ -21,7 +21,7 @@ func exit(code int32)
 func usleep(usec uint32)
 
 //go:noescape
-func write(fd uintptr, p unsafe.Pointer, n int32) int32
+func write1(fd uintptr, p unsafe.Pointer, n int32) int32
 
 //go:noescape
 func open(name *byte, mode, perm int32) int32

diff --git a/src/runtime/stubs3.go b/src/runtime/stubs3.go
index a9ff689e79f8ffbf3b8370b8bdecf140cd7dd5b5..f81372805e805c69a94bf76e826ea6c8f2c6e1ae 100644 (file)
--- a/src/runtime/stubs3.go
+++ b/src/runtime/stubs3.go
@@ -4,7 +4,6 @@
 
 // +build !plan9
 // +build !solaris
-// +build !windows
 // +build !nacl
 // +build !freebsd
 // +build !darwin
@@ -12,4 +11,4 @@
 
 package runtime
 
-func nanotime() int64
+func nanotime1() int64

diff --git a/src/runtime/sys_aix_ppc64.s b/src/runtime/sys_aix_ppc64.s
index 75f41786cd59a75bf8f408c2c4c9d5386c1a00b0..a56d043f4251ef4a0eef26d44b99860224fe3f45 100644 (file)
--- a/src/runtime/sys_aix_ppc64.s
+++ b/src/runtime/sys_aix_ppc64.s
@@ -258,8 +258,8 @@ TEXT runtime·exit1(SB),NOSPLIT,$0-4
        CSYSCALL()
        RET
 
-// Runs on OS stack, called from runtime·write.
-TEXT runtime·write1(SB),NOSPLIT,$0-28
+// Runs on OS stack, called from runtime·write1.
+TEXT runtime·write2(SB),NOSPLIT,$0-28
        MOVD    fd+0(FP), R3
        MOVD    p+8(FP), R4
        MOVW    n+16(FP), R5

diff --git a/src/runtime/sys_darwin.go b/src/runtime/sys_darwin.go
index 376f76dbc52fb55523dc999f08e3d4050f13ba12..932a2a77571267b5a713b89820f75e82d00bcc82 100644 (file)
--- a/src/runtime/sys_darwin.go
+++ b/src/runtime/sys_darwin.go
@@ -230,7 +230,7 @@ func usleep_trampoline()
 
 //go:nosplit
 //go:cgo_unsafe_args
-func write(fd uintptr, p unsafe.Pointer, n int32) int32 {
+func write1(fd uintptr, p unsafe.Pointer, n int32) int32 {
        return libcCall(unsafe.Pointer(funcPC(write_trampoline)), unsafe.Pointer(&fd))
 }
 func write_trampoline()
@@ -244,7 +244,7 @@ func open_trampoline()
 
 //go:nosplit
 //go:cgo_unsafe_args
-func nanotime() int64 {
+func nanotime1() int64 {
        var r struct {
                t            int64  // raw timer
                numer, denom uint32 // conversion factors. nanoseconds = t * numer / denom.
@@ -266,7 +266,7 @@ func nanotime_trampoline()
 
 //go:nosplit
 //go:cgo_unsafe_args
-func walltime() (int64, int32) {
+func walltime1() (int64, int32) {
        var t timeval
        libcCall(unsafe.Pointer(funcPC(walltime_trampoline)), unsafe.Pointer(&t))
        return int64(t.tv_sec), 1000 * t.tv_usec

diff --git a/src/runtime/sys_dragonfly_amd64.s b/src/runtime/sys_dragonfly_amd64.s
index b771850aaf5e24676457edc8b43db0586bedcd7a..ab9ca3795ff6d820ca511efcb58b91e74372d7df 100644 (file)
--- a/src/runtime/sys_dragonfly_amd64.s
+++ b/src/runtime/sys_dragonfly_amd64.s
@@ -108,7 +108,7 @@ TEXT runtime·read(SB),NOSPLIT,$-8
        MOVL    AX, ret+24(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$-8
+TEXT runtime·write1(SB),NOSPLIT,$-8
        MOVQ    fd+0(FP), DI            // arg 1 fd
        MOVQ    p+8(FP), SI             // arg 2 buf
        MOVL    n+16(FP), DX            // arg 3 count
@@ -146,8 +146,8 @@ TEXT runtime·setitimer(SB), NOSPLIT, $-8
        SYSCALL
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB), NOSPLIT, $32
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB), NOSPLIT, $32
        MOVL    $232, AX // clock_gettime
        MOVQ    $0, DI          // CLOCK_REALTIME
        LEAQ    8(SP), SI
@@ -160,7 +160,7 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVL    DX, nsec+8(FP)
        RET
 
-TEXT runtime·nanotime(SB), NOSPLIT, $32
+TEXT runtime·nanotime1(SB), NOSPLIT, $32
        MOVL    $232, AX
        MOVQ    $4, DI          // CLOCK_MONOTONIC
        LEAQ    8(SP), SI

diff --git a/src/runtime/sys_freebsd_386.s b/src/runtime/sys_freebsd_386.s
index 35f357a1d9cbf3dac9db9f9eae603406dbf114dc..7ff4016de3e22082291e3d3d2affa463bd0e0f64 100644 (file)
--- a/src/runtime/sys_freebsd_386.s
+++ b/src/runtime/sys_freebsd_386.s
@@ -97,7 +97,7 @@ TEXT runtime·read(SB),NOSPLIT,$-4
        MOVL    AX, ret+12(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$-4
+TEXT runtime·write1(SB),NOSPLIT,$-4
        MOVL    $4, AX
        INT     $0x80
        JAE     2(PC)

diff --git a/src/runtime/sys_freebsd_amd64.s b/src/runtime/sys_freebsd_amd64.s
index 55959b3e3a333a41affdcbc87a47a9014c784ae0..6f6da480d86f20ae8dd6e6f623bb19045bb904fa 100644 (file)
--- a/src/runtime/sys_freebsd_amd64.s
+++ b/src/runtime/sys_freebsd_amd64.s
@@ -97,7 +97,7 @@ TEXT runtime·read(SB),NOSPLIT,$-8
        MOVL    AX, ret+24(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$-8
+TEXT runtime·write1(SB),NOSPLIT,$-8
        MOVQ    fd+0(FP), DI            // arg 1 fd
        MOVQ    p+8(FP), SI             // arg 2 buf
        MOVL    n+16(FP), DX            // arg 3 count

diff --git a/src/runtime/sys_freebsd_arm.s b/src/runtime/sys_freebsd_arm.s
index f347b9fa961b99a334a31f3f0e42033466570c06..1bdc10681a7ca0cbd0a03566b583957f77ea24bc 100644 (file)
--- a/src/runtime/sys_freebsd_arm.s
+++ b/src/runtime/sys_freebsd_arm.s
@@ -119,7 +119,7 @@ TEXT runtime·read(SB),NOSPLIT|NOFRAME,$0
        MOVW    R0, ret+12(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT|NOFRAME,$0
+TEXT runtime·write1(SB),NOSPLIT|NOFRAME,$0
        MOVW fd+0(FP), R0       // arg 1 fd
        MOVW p+4(FP), R1        // arg 2 buf
        MOVW n+8(FP), R2        // arg 3 count

diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
index 72c43bd9da62a8c958dbc3038f70bd73fc90e450..882f31cd641e8b3bc5f53238a824711a9b40ecd6 100644 (file)
--- a/src/runtime/sys_linux_386.s
+++ b/src/runtime/sys_linux_386.s
@@ -107,7 +107,7 @@ TEXT runtime·closefd(SB),NOSPLIT,$0
        MOVL    AX, ret+4(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$0
+TEXT runtime·write1(SB),NOSPLIT,$0
        MOVL    $SYS_write, AX
        MOVL    fd+0(FP), BX
        MOVL    p+4(FP), CX
@@ -192,8 +192,8 @@ TEXT runtime·mincore(SB),NOSPLIT,$0-16
        MOVL    AX, ret+12(FP)
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB), NOSPLIT, $0-12
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB), NOSPLIT, $0-12
        // We don't know how much stack space the VDSO code will need,
        // so switch to g0.
 
@@ -257,7 +257,7 @@ finish:
 
 // int64 nanotime(void) so really
 // void nanotime(int64 *nsec)
-TEXT runtime·nanotime(SB), NOSPLIT, $0-8
+TEXT runtime·nanotime1(SB), NOSPLIT, $0-8
        // Switch to g0 stack. See comment above in runtime·walltime.
 
        MOVL    SP, BP  // Save old SP; BP unchanged by C code.

diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
index 5c300f553d3f462cba6599c406375d13cf954954..7e8f5279cacd1a5edeaeb0a8246c1aaa9fce9db9 100644 (file)
--- a/src/runtime/sys_linux_amd64.s
+++ b/src/runtime/sys_linux_amd64.s
@@ -89,7 +89,7 @@ TEXT runtime·closefd(SB),NOSPLIT,$0-12
        MOVL    AX, ret+8(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$0-28
+TEXT runtime·write1(SB),NOSPLIT,$0-28
        MOVQ    fd+0(FP), DI
        MOVQ    p+8(FP), SI
        MOVL    n+16(FP), DX
@@ -175,8 +175,8 @@ TEXT runtime·mincore(SB),NOSPLIT,$0-28
        MOVL    AX, ret+24(FP)
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB),NOSPLIT,$0-12
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB),NOSPLIT,$0-12
        // We don't know how much stack space the VDSO code will need,
        // so switch to g0.
        // In particular, a kernel configured with CONFIG_OPTIMIZE_INLINING=n
@@ -233,7 +233,7 @@ fallback:
        MOVL    DX, nsec+8(FP)
        RET
 
-TEXT runtime·nanotime(SB),NOSPLIT,$0-8
+TEXT runtime·nanotime1(SB),NOSPLIT,$0-8
        // Switch to g0 stack. See comment above in runtime·walltime.
 
        MOVQ    SP, BP  // Save old SP; BP unchanged by C code.

diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s
index 9c7398451c143ff64e9b8fc7ef8dcd74bd47ab64..c7d83a6d3aced89564e90851118f264c25d2fe9e 100644 (file)
--- a/src/runtime/sys_linux_arm.s
+++ b/src/runtime/sys_linux_arm.s
@@ -75,7 +75,7 @@ TEXT runtime·closefd(SB),NOSPLIT,$0
        MOVW    R0, ret+4(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$0
+TEXT runtime·write1(SB),NOSPLIT,$0
        MOVW    fd+0(FP), R0
        MOVW    p+4(FP), R1
        MOVW    n+8(FP), R2
@@ -215,7 +215,7 @@ TEXT runtime·mincore(SB),NOSPLIT,$0
        MOVW    R0, ret+12(FP)
        RET
 
-TEXT runtime·walltime(SB),NOSPLIT,$0-12
+TEXT runtime·walltime1(SB),NOSPLIT,$0-12
        // We don't know how much stack space the VDSO code will need,
        // so switch to g0.
 
@@ -266,8 +266,8 @@ finish:
        MOVW    R2, nsec+8(FP)
        RET
 
-// int64 nanotime(void)
-TEXT runtime·nanotime(SB),NOSPLIT,$0-8
+// int64 nanotime1(void)
+TEXT runtime·nanotime1(SB),NOSPLIT,$0-8
        // Switch to g0 stack. See comment above in runtime·walltime.
 
        // Save old SP. Use R13 instead of SP to avoid linker rewriting the offsets.

diff --git a/src/runtime/sys_linux_arm64.s b/src/runtime/sys_linux_arm64.s
index 2835b6ca1cb2346c9aac22f39a4b6bd9ee06e608..bce948a91e042787b6fb32cbc0d966cafa2fc60d 100644 (file)
--- a/src/runtime/sys_linux_arm64.s
+++ b/src/runtime/sys_linux_arm64.s
@@ -91,7 +91,7 @@ done:
        MOVW    R0, ret+8(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT|NOFRAME,$0-28
+TEXT runtime·write1(SB),NOSPLIT|NOFRAME,$0-28
        MOVD    fd+0(FP), R0
        MOVD    p+8(FP), R1
        MOVW    n+16(FP), R2
@@ -181,8 +181,8 @@ TEXT runtime·mincore(SB),NOSPLIT|NOFRAME,$0-28
        MOVW    R0, ret+24(FP)
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB),NOSPLIT,$24-12
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB),NOSPLIT,$24-12
        MOVD    RSP, R20        // R20 is unchanged by C code
        MOVD    RSP, R1
 
@@ -225,7 +225,7 @@ finish:
        MOVW    R5, nsec+8(FP)
        RET
 
-TEXT runtime·nanotime(SB),NOSPLIT,$24-8
+TEXT runtime·nanotime1(SB),NOSPLIT,$24-8
        MOVD    RSP, R20        // R20 is unchanged by C code
        MOVD    RSP, R1
 

diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s
index 33ed1050c291fcdc46fa2bca9eef376c2582eb99..26b619e238fa92b7c9c463a0a524ed7fccfb0300 100644 (file)
--- a/src/runtime/sys_linux_mips64x.s
+++ b/src/runtime/sys_linux_mips64x.s
@@ -88,7 +88,7 @@ TEXT runtime·closefd(SB),NOSPLIT|NOFRAME,$0-12
        MOVW    R2, ret+8(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT|NOFRAME,$0-28
+TEXT runtime·write1(SB),NOSPLIT|NOFRAME,$0-28
        MOVV    fd+0(FP), R4
        MOVV    p+8(FP), R5
        MOVW    n+16(FP), R6
@@ -176,8 +176,8 @@ TEXT runtime·mincore(SB),NOSPLIT|NOFRAME,$0-28
        MOVW    R2, ret+24(FP)
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB),NOSPLIT,$16
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB),NOSPLIT,$16
        MOVW    $0, R4 // CLOCK_REALTIME
        MOVV    $0(R29), R5
        MOVV    $SYS_clock_gettime, R2
@@ -188,7 +188,7 @@ TEXT runtime·walltime(SB),NOSPLIT,$16
        MOVW    R5, nsec+8(FP)
        RET
 
-TEXT runtime·nanotime(SB),NOSPLIT,$16
+TEXT runtime·nanotime1(SB),NOSPLIT,$16
        MOVW    $1, R4 // CLOCK_MONOTONIC
        MOVV    $0(R29), R5
        MOVV    $SYS_clock_gettime, R2

diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s
index 6e539fbc6f1123efdf28941782cf3cfe19f28e76..30d962c325043d4e893c502f540bbae88a549336 100644 (file)
--- a/src/runtime/sys_linux_mipsx.s
+++ b/src/runtime/sys_linux_mipsx.s
@@ -86,7 +86,7 @@ TEXT runtime·closefd(SB),NOSPLIT,$0-8
        MOVW    R2, ret+4(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$0-16
+TEXT runtime·write1(SB),NOSPLIT,$0-16
        MOVW    fd+0(FP), R4
        MOVW    p+4(FP), R5
        MOVW    n+8(FP), R6
@@ -174,8 +174,8 @@ TEXT runtime·mincore(SB),NOSPLIT,$0-16
        MOVW    R2, ret+12(FP)
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB),NOSPLIT,$8-12
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB),NOSPLIT,$8-12
        MOVW    $0, R4  // CLOCK_REALTIME
        MOVW    $4(R29), R5
        MOVW    $SYS_clock_gettime, R2
@@ -193,7 +193,7 @@ TEXT runtime·walltime(SB),NOSPLIT,$8-12
        MOVW    R5, nsec+8(FP)
        RET
 
-TEXT runtime·nanotime(SB),NOSPLIT,$8-8
+TEXT runtime·nanotime1(SB),NOSPLIT,$8-8
        MOVW    $1, R4  // CLOCK_MONOTONIC
        MOVW    $4(R29), R5
        MOVW    $SYS_clock_gettime, R2

diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s
index 13d23156bdbbe861631745f8befa934b3acc04f2..cda195687582a7b8f154bc5f238a5e727a3f0596 100644 (file)
--- a/src/runtime/sys_linux_ppc64x.s
+++ b/src/runtime/sys_linux_ppc64x.s
@@ -80,7 +80,7 @@ TEXT runtime·closefd(SB),NOSPLIT|NOFRAME,$0-12
        MOVW    R3, ret+8(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT|NOFRAME,$0-28
+TEXT runtime·write1(SB),NOSPLIT|NOFRAME,$0-28
        MOVD    fd+0(FP), R3
        MOVD    p+8(FP), R4
        MOVW    n+16(FP), R5
@@ -155,8 +155,8 @@ TEXT runtime·mincore(SB),NOSPLIT|NOFRAME,$0-28
        MOVW    R3, ret+24(FP)
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB),NOSPLIT,$16
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB),NOSPLIT,$16
        MOVD    R1, R15         // R15 is unchanged by C code
        MOVD    g_m(g), R21     // R21 = m
 
@@ -203,7 +203,7 @@ fallback:
        MOVD    40(R1), R5
        JMP     finish
 
-TEXT runtime·nanotime(SB),NOSPLIT,$16
+TEXT runtime·nanotime1(SB),NOSPLIT,$16
        MOVD    $1, R3          // CLOCK_MONOTONIC
 
        MOVD    R1, R15         // R15 is unchanged by C code

diff --git a/src/runtime/sys_linux_s390x.s b/src/runtime/sys_linux_s390x.s
index 58b36dff0aa9bd5d0aebb346dfba3dbcbdbd7711..f8ef4eca3220232069b2f7537f4d60b99b010d74 100644 (file)
--- a/src/runtime/sys_linux_s390x.s
+++ b/src/runtime/sys_linux_s390x.s
@@ -80,7 +80,7 @@ TEXT runtime·closefd(SB),NOSPLIT|NOFRAME,$0-12
        MOVW    R2, ret+8(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT|NOFRAME,$0-28
+TEXT runtime·write1(SB),NOSPLIT|NOFRAME,$0-28
        MOVD    fd+0(FP), R2
        MOVD    p+8(FP), R3
        MOVW    n+16(FP), R4
@@ -167,8 +167,8 @@ TEXT runtime·mincore(SB),NOSPLIT|NOFRAME,$0-28
        MOVW    R2, ret+24(FP)
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB),NOSPLIT,$16
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB),NOSPLIT,$16
        MOVW    $0, R2 // CLOCK_REALTIME
        MOVD    $tp-16(SP), R3
        MOVW    $SYS_clock_gettime, R1
@@ -179,7 +179,7 @@ TEXT runtime·walltime(SB),NOSPLIT,$16
        MOVW    R3, nsec+8(FP)
        RET
 
-TEXT runtime·nanotime(SB),NOSPLIT,$16
+TEXT runtime·nanotime1(SB),NOSPLIT,$16
        MOVW    $1, R2 // CLOCK_MONOTONIC
        MOVD    $tp-16(SP), R3
        MOVW    $SYS_clock_gettime, R1

diff --git a/src/runtime/sys_netbsd_386.s b/src/runtime/sys_netbsd_386.s
index c14ecfb2e0852d361ce66cfe1e0ab4ce805b3149..b8c5a92a4fb813c68713f9a0b6a025e87fa00d92 100644 (file)
--- a/src/runtime/sys_netbsd_386.s
+++ b/src/runtime/sys_netbsd_386.s
@@ -87,7 +87,7 @@ TEXT runtime·read(SB),NOSPLIT,$-4
        MOVL    AX, ret+12(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$-4
+TEXT runtime·write1(SB),NOSPLIT,$-4
        MOVL    $SYS_write, AX
        INT     $0x80
        JAE     2(PC)
@@ -181,8 +181,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$-4
        INT     $0x80
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB), NOSPLIT, $32
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB), NOSPLIT, $32
        LEAL    12(SP), BX
        MOVL    $CLOCK_REALTIME, 4(SP)  // arg 1 - clock_id
        MOVL    BX, 8(SP)               // arg 2 - tp
@@ -198,9 +198,9 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVL    BX, nsec+8(FP)
        RET
 
-// int64 nanotime(void) so really
-// void nanotime(int64 *nsec)
-TEXT runtime·nanotime(SB),NOSPLIT,$32
+// int64 nanotime1(void) so really
+// void nanotime1(int64 *nsec)
+TEXT runtime·nanotime1(SB),NOSPLIT,$32
        LEAL    12(SP), BX
        MOVL    $CLOCK_MONOTONIC, 4(SP) // arg 1 - clock_id
        MOVL    BX, 8(SP)               // arg 2 - tp

diff --git a/src/runtime/sys_netbsd_amd64.s b/src/runtime/sys_netbsd_amd64.s
index 5fc47aefd3f8206cab6defe8e827dfd28c706158..b1b50ab4a9917e4388e653376053204dc29a7ec8 100644 (file)
--- a/src/runtime/sys_netbsd_amd64.s
+++ b/src/runtime/sys_netbsd_amd64.s
@@ -158,7 +158,7 @@ TEXT runtime·read(SB),NOSPLIT,$-8
        MOVL    AX, ret+24(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$-8
+TEXT runtime·write1(SB),NOSPLIT,$-8
        MOVQ    fd+0(FP), DI            // arg 1 - fd
        MOVQ    p+8(FP), SI             // arg 2 - buf
        MOVL    n+16(FP), DX            // arg 3 - nbyte
@@ -211,8 +211,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$-8
        SYSCALL
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB), NOSPLIT, $32
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB), NOSPLIT, $32
        MOVQ    $CLOCK_REALTIME, DI     // arg 1 - clock_id
        LEAQ    8(SP), SI               // arg 2 - tp
        MOVL    $SYS___clock_gettime50, AX
@@ -225,7 +225,7 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVL    DX, nsec+8(FP)
        RET
 
-TEXT runtime·nanotime(SB),NOSPLIT,$32
+TEXT runtime·nanotime1(SB),NOSPLIT,$32
        MOVQ    $CLOCK_MONOTONIC, DI    // arg 1 - clock_id
        LEAQ    8(SP), SI               // arg 2 - tp
        MOVL    $SYS___clock_gettime50, AX

diff --git a/src/runtime/sys_netbsd_arm.s b/src/runtime/sys_netbsd_arm.s
index c32259b34d7cae2f485529024545e3c658033081..90f37e1a0560a1fe108653d9dd2bbee8dcff45cd 100644 (file)
--- a/src/runtime/sys_netbsd_arm.s
+++ b/src/runtime/sys_netbsd_arm.s
@@ -96,7 +96,7 @@ TEXT runtime·read(SB),NOSPLIT|NOFRAME,$0
        MOVW    R0, ret+12(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT|NOFRAME,$0
+TEXT runtime·write1(SB),NOSPLIT|NOFRAME,$0
        MOVW    fd+0(FP), R0    // arg 1 - fd
        MOVW    p+4(FP), R1     // arg 2 - buf
        MOVW    n+8(FP), R2     // arg 3 - nbyte
@@ -188,8 +188,8 @@ TEXT runtime·setitimer(SB),NOSPLIT|NOFRAME,$0
        SWI $SYS___setitimer50
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB), NOSPLIT, $32
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB), NOSPLIT, $32
        MOVW $0, R0     // CLOCK_REALTIME
        MOVW $8(R13), R1
        SWI $SYS___clock_gettime50
@@ -203,9 +203,9 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVW R2, nsec+8(FP)
        RET
 
-// int64 nanotime(void) so really
-// void nanotime(int64 *nsec)
-TEXT runtime·nanotime(SB), NOSPLIT, $32
+// int64 nanotime1(void) so really
+// void nanotime1(int64 *nsec)
+TEXT runtime·nanotime1(SB), NOSPLIT, $32
        MOVW $3, R0 // CLOCK_MONOTONIC
        MOVW $8(R13), R1
        SWI $SYS___clock_gettime50

diff --git a/src/runtime/sys_netbsd_arm64.s b/src/runtime/sys_netbsd_arm64.s
index 57ded53858612845f8c751146c7aa2e63b76bf83..55abdd52d6f92907912ecf3de8b1cae579a7965b 100644 (file)
--- a/src/runtime/sys_netbsd_arm64.s
+++ b/src/runtime/sys_netbsd_arm64.s
@@ -146,7 +146,7 @@ ok:
        MOVW    R0, ret+24(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$-8
+TEXT runtime·write1(SB),NOSPLIT,$-8
        MOVD    fd+0(FP), R0            // arg 1 - fd
        MOVD    p+8(FP), R1             // arg 2 - buf
        MOVW    n+16(FP), R2            // arg 3 - nbyte
@@ -195,8 +195,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$-8
        SVC     $SYS___setitimer50
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB), NOSPLIT, $32
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB), NOSPLIT, $32
        MOVW    $CLOCK_REALTIME, R0     // arg 1 - clock_id
        MOVD    $8(RSP), R1             // arg 2 - tp
        SVC     $SYS___clock_gettime50
@@ -209,9 +209,9 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVW    R1, nsec+8(FP)
        RET
 
-// int64 nanotime(void) so really
-// void nanotime(int64 *nsec)
-TEXT runtime·nanotime(SB), NOSPLIT, $32
+// int64 nanotime1(void) so really
+// void nanotime1(int64 *nsec)
+TEXT runtime·nanotime1(SB), NOSPLIT, $32
        MOVD    $CLOCK_MONOTONIC, R0    // arg 1 - clock_id
        MOVD    $8(RSP), R1             // arg 2 - tp
        SVC     $SYS___clock_gettime50

diff --git a/src/runtime/sys_openbsd_386.s b/src/runtime/sys_openbsd_386.s
index 6457e37c012063be373452db3672f8b323e637c7..31c837cd81d06860c3da7f5af77058a102810190 100644 (file)
--- a/src/runtime/sys_openbsd_386.s
+++ b/src/runtime/sys_openbsd_386.s
@@ -50,7 +50,7 @@ TEXT runtime·read(SB),NOSPLIT,$-4
        MOVL    AX, ret+12(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$-4
+TEXT runtime·write1(SB),NOSPLIT,$-4
        MOVL    $4, AX                  // sys_write
        INT     $0x80
        JAE     2(PC)
@@ -145,8 +145,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$-4
        INT     $0x80
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB), NOSPLIT, $32
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB), NOSPLIT, $32
        LEAL    12(SP), BX
        MOVL    $0, 4(SP)               // arg 1 - clock_id
        MOVL    BX, 8(SP)               // arg 2 - tp
@@ -162,9 +162,9 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVL    BX, nsec+8(FP)
        RET
 
-// int64 nanotime(void) so really
-// void nanotime(int64 *nsec)
-TEXT runtime·nanotime(SB),NOSPLIT,$32
+// int64 nanotime1(void) so really
+// void nanotime1(int64 *nsec)
+TEXT runtime·nanotime1(SB),NOSPLIT,$32
        LEAL    12(SP), BX
        MOVL    CLOCK_MONOTONIC, 4(SP)  // arg 1 - clock_id
        MOVL    BX, 8(SP)               // arg 2 - tp

diff --git a/src/runtime/sys_openbsd_amd64.s b/src/runtime/sys_openbsd_amd64.s
index d5c030dd8d07579d7371e784f1b5abb68b3361a0..17dd9e86a0c344c217f49b78080a66b36af8650a 100644 (file)
--- a/src/runtime/sys_openbsd_amd64.s
+++ b/src/runtime/sys_openbsd_amd64.s
@@ -127,7 +127,7 @@ TEXT runtime·read(SB),NOSPLIT,$-8
        MOVL    AX, ret+24(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT,$-8
+TEXT runtime·write1(SB),NOSPLIT,$-8
        MOVQ    fd+0(FP), DI            // arg 1 - fd
        MOVQ    p+8(FP), SI             // arg 2 - buf
        MOVL    n+16(FP), DX            // arg 3 - nbyte
@@ -181,8 +181,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$-8
        SYSCALL
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB), NOSPLIT, $32
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB), NOSPLIT, $32
        MOVQ    $0, DI                  // arg 1 - clock_id
        LEAQ    8(SP), SI               // arg 2 - tp
        MOVL    $87, AX                 // sys_clock_gettime
@@ -195,7 +195,7 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
        MOVL    DX, nsec+8(FP)
        RET
 
-TEXT runtime·nanotime(SB),NOSPLIT,$24
+TEXT runtime·nanotime1(SB),NOSPLIT,$24
        MOVQ    CLOCK_MONOTONIC, DI     // arg 1 - clock_id
        LEAQ    8(SP), SI               // arg 2 - tp
        MOVL    $87, AX                 // sys_clock_gettime

diff --git a/src/runtime/sys_openbsd_arm.s b/src/runtime/sys_openbsd_arm.s
index 69c3ded17ffa3a775e51c0e4a4c86fc0a4f632fd..69a5f4cf76a98dd1fd8b42407d8e8d10ecb21400 100644 (file)
--- a/src/runtime/sys_openbsd_arm.s
+++ b/src/runtime/sys_openbsd_arm.s
@@ -59,7 +59,7 @@ TEXT runtime·read(SB),NOSPLIT|NOFRAME,$0
        MOVW    R0, ret+12(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT|NOFRAME,$0
+TEXT runtime·write1(SB),NOSPLIT|NOFRAME,$0
        MOVW    fd+0(FP), R0            // arg 1 - fd
        MOVW    p+4(FP), R1             // arg 2 - buf
        MOVW    n+8(FP), R2             // arg 3 - nbyte
@@ -155,8 +155,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$0
        SWI     $0
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB), NOSPLIT, $32
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB), NOSPLIT, $32
        MOVW    CLOCK_REALTIME, R0      // arg 1 - clock_id
        MOVW    $8(R13), R1             // arg 2 - tp
        MOVW    $87, R12                // sys_clock_gettime
@@ -172,9 +172,9 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
 
        RET
 
-// int64 nanotime(void) so really
-// void nanotime(int64 *nsec)
-TEXT runtime·nanotime(SB),NOSPLIT,$32
+// int64 nanotime1(void) so really
+// void nanotime1(int64 *nsec)
+TEXT runtime·nanotime1(SB),NOSPLIT,$32
        MOVW    CLOCK_MONOTONIC, R0     // arg 1 - clock_id
        MOVW    $8(R13), R1             // arg 2 - tp
        MOVW    $87, R12                // sys_clock_gettime

diff --git a/src/runtime/sys_openbsd_arm64.s b/src/runtime/sys_openbsd_arm64.s
index 52bed4bd8bcca91fcd500a8bf23019b057ab5ca6..e9c2a8b62c1260b6f1cf5e3016bb7e9ff13ade59 100644 (file)
--- a/src/runtime/sys_openbsd_arm64.s
+++ b/src/runtime/sys_openbsd_arm64.s
@@ -63,7 +63,7 @@ TEXT runtime·read(SB),NOSPLIT|NOFRAME,$0
        MOVW    R0, ret+24(FP)
        RET
 
-TEXT runtime·write(SB),NOSPLIT|NOFRAME,$0
+TEXT runtime·write1(SB),NOSPLIT|NOFRAME,$0
        MOVW    fd+0(FP), R0            // arg 1 - fd
        MOVD    p+8(FP), R1             // arg 2 - buf
        MOVW    n+16(FP), R2            // arg 3 - nbyte
@@ -158,8 +158,8 @@ TEXT runtime·setitimer(SB),NOSPLIT,$0
        SVC
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB), NOSPLIT, $32
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB), NOSPLIT, $32
        MOVW    CLOCK_REALTIME, R0      // arg 1 - clock_id
        MOVD    $8(RSP), R1             // arg 2 - tp
        MOVD    $87, R8                 // sys_clock_gettime
@@ -172,9 +172,9 @@ TEXT runtime·walltime(SB), NOSPLIT, $32
 
        RET
 
-// int64 nanotime(void) so really
-// void nanotime(int64 *nsec)
-TEXT runtime·nanotime(SB),NOSPLIT,$32
+// int64 nanotime1(void) so really
+// void nanotime1(int64 *nsec)
+TEXT runtime·nanotime1(SB),NOSPLIT,$32
        MOVW    CLOCK_MONOTONIC, R0     // arg 1 - clock_id
        MOVD    $8(RSP), R1             // arg 2 - tp
        MOVD    $87, R8                 // sys_clock_gettime

diff --git a/src/runtime/sys_plan9_386.s b/src/runtime/sys_plan9_386.s
index a7fb9fe6f7c648f24fb44c5edf209bcc26b807fb..f9969f6d1001b19e3e23c73d1695eef7d99bba80 100644 (file)
--- a/src/runtime/sys_plan9_386.s
+++ b/src/runtime/sys_plan9_386.s
@@ -102,9 +102,9 @@ TEXT runtime·nsec(SB),NOSPLIT,$8
        MOVL    $-1, ret_hi+8(FP)
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB),NOSPLIT,$8-12
-       CALL    runtime·nanotime(SB)
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB),NOSPLIT,$8-12
+       CALL    runtime·nanotime1(SB)
        MOVL    0(SP), AX
        MOVL    4(SP), DX
 

diff --git a/src/runtime/sys_plan9_amd64.s b/src/runtime/sys_plan9_amd64.s
index a73c33f10495ddac0b8c215cfae9d80b10d049db..383622b5a6cc77c662e9ae199f473c6d836d1ea6 100644 (file)
--- a/src/runtime/sys_plan9_amd64.s
+++ b/src/runtime/sys_plan9_amd64.s
@@ -88,9 +88,9 @@ TEXT runtime·nsec(SB),NOSPLIT,$0
        MOVQ    AX, ret+8(FP)
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB),NOSPLIT,$8-12
-       CALL    runtime·nanotime(SB)
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB),NOSPLIT,$8-12
+       CALL    runtime·nanotime1(SB)
        MOVQ    0(SP), AX
 
        // generated code for

diff --git a/src/runtime/sys_plan9_arm.s b/src/runtime/sys_plan9_arm.s
index b82e6c66cd8c11842f27eae1881b592ac0226f11..9fbe30536dc2d3875b91a21c54ce1d51012931a5 100644 (file)
--- a/src/runtime/sys_plan9_arm.s
+++ b/src/runtime/sys_plan9_arm.s
@@ -138,8 +138,8 @@ TEXT runtime·nsec(SB),NOSPLIT|NOFRAME,$0-12
        MOVW    R0, ret_hi+8(FP)
        RET
 
-// time.now() (sec int64, nsec int32)
-TEXT runtime·walltime(SB),NOSPLIT,$12-12
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB),NOSPLIT,$12-12
        // use nsec system call to get current time in nanoseconds
        MOVW    $sysnsec_lo-8(SP), R0   // destination addr
        MOVW    R0,res-12(SP)

diff --git a/src/runtime/sys_solaris_amd64.s b/src/runtime/sys_solaris_amd64.s
index ead8c8d2ec47e6b74bddea0f019d608422b8030f..bd5f7736adc6ad8f9a4d2c616f8a2bca6972d78d 100644 (file)
--- a/src/runtime/sys_solaris_amd64.s
+++ b/src/runtime/sys_solaris_amd64.s
@@ -29,14 +29,14 @@ TEXT runtime·miniterrno(SB),NOSPLIT,$0
        MOVQ    AX,     (m_mOS+mOS_perrno)(BX)
        RET
 
-// int64 runtime·nanotime1(void);
+// int64 runtime·nanotime2(void);
 //
 // clock_gettime(3c) wrapper because Timespec is too large for
 // runtime·nanotime stack.
 //
 // Called using runtime·sysvicall6 from os_solaris.c:/nanotime.
 // NOT USING GO CALLING CONVENTION.
-TEXT runtime·nanotime1(SB),NOSPLIT,$0
+TEXT runtime·nanotime2(SB),NOSPLIT,$0
        // need space for the timespec argument.
        SUBQ    $64, SP // 16 bytes will do, but who knows in the future?
        MOVQ    $3, DI  // CLOCK_REALTIME from <sys/time_impl.h>
@@ -339,9 +339,9 @@ TEXT runtime·osyield1(SB),NOSPLIT,$0
        CALL    AX
        RET
 
-// func walltime() (sec int64, nsec int32)
-TEXT runtime·walltime(SB),NOSPLIT,$8-12
-       CALL    runtime·nanotime(SB)
+// func walltime1() (sec int64, nsec int32)
+TEXT runtime·walltime1(SB),NOSPLIT,$8-12
+       CALL    runtime·nanotime1(SB)
        MOVQ    0(SP), AX
 
        // generated code for

diff --git a/src/runtime/sys_wasm.s b/src/runtime/sys_wasm.s
index 823757814c5a78fea5ab6f27f151244a15cd6706..0cd1fe508083793bac23f3c85eb948729af6d717 100644 (file)
--- a/src/runtime/sys_wasm.s
+++ b/src/runtime/sys_wasm.s
@@ -183,11 +183,11 @@ TEXT ·wasmWrite(SB), NOSPLIT, $0
        CallImport
        RET
 
-TEXT ·nanotime(SB), NOSPLIT, $0
+TEXT ·nanotime1(SB), NOSPLIT, $0
        CallImport
        RET
 
-TEXT ·walltime(SB), NOSPLIT, $0
+TEXT ·walltime1(SB), NOSPLIT, $0
        CallImport
        RET
 

diff --git a/src/runtime/sys_windows_386.s b/src/runtime/sys_windows_386.s
index 761da8eaef1a4d8313bd9e8b43ba91bff7f91ddb..9e1f40925d736c7a3b4fe1689875fe963ab6771f 100644 (file)
--- a/src/runtime/sys_windows_386.s
+++ b/src/runtime/sys_windows_386.s
@@ -444,7 +444,7 @@ TEXT runtime·switchtothread(SB),NOSPLIT,$0
 #define time_hi1 4
 #define time_hi2 8
 
-TEXT runtime·nanotime(SB),NOSPLIT,$0-8
+TEXT runtime·nanotime1(SB),NOSPLIT,$0-8
        CMPB    runtime·useQPCTime(SB), $0
        JNE     useQPC
 loop:

diff --git a/src/runtime/sys_windows_amd64.s b/src/runtime/sys_windows_amd64.s
index 2aea8eaff7ec15eb93d84fe39ebe2701a4c48b06..d2552e87facd733a1d2a62e93b7c4897dbe45b1b 100644 (file)
--- a/src/runtime/sys_windows_amd64.s
+++ b/src/runtime/sys_windows_amd64.s
@@ -473,7 +473,7 @@ TEXT runtime·switchtothread(SB),NOSPLIT|NOFRAME,$0
 #define time_hi1 4
 #define time_hi2 8
 
-TEXT runtime·nanotime(SB),NOSPLIT,$0-8
+TEXT runtime·nanotime1(SB),NOSPLIT,$0-8
        CMPB    runtime·useQPCTime(SB), $0
        JNE     useQPC
        MOVQ    $_INTERRUPT_TIME, DI

diff --git a/src/runtime/sys_windows_arm.s b/src/runtime/sys_windows_arm.s
index 8f8af0a4f7ec5f668441a2817807043f03fd59e7..256b5ff7f0ec68b6d25ca7923616672ee51031c4 100644 (file)
--- a/src/runtime/sys_windows_arm.s
+++ b/src/runtime/sys_windows_arm.s
@@ -495,7 +495,7 @@ TEXT runtime·read_tls_fallback(SB),NOSPLIT|NOFRAME,$0
 #define time_hi1 4
 #define time_hi2 8
 
-TEXT runtime·nanotime(SB),NOSPLIT,$0-8
+TEXT runtime·nanotime1(SB),NOSPLIT,$0-8
        MOVW    $0, R0
        MOVB    runtime·useQPCTime(SB), R0
        CMP     $0, R0

diff --git a/src/runtime/time_nofake.go b/src/runtime/time_nofake.go
new file mode 100644 (file)
index 0000000..233097d
--- /dev/null
+++ b/src/runtime/time_nofake.go
@@ -0,0 +1,25 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !nacl
+
+package runtime
+
+import "unsafe"
+
+//go:nosplit
+func nanotime() int64 {
+       return nanotime1()
+}
+
+func walltime() (sec int64, nsec int32) {
+       return walltime1()
+}
+
+// write must be nosplit on Windows (see write1)
+//
+//go:nosplit
+func write(fd uintptr, p unsafe.Pointer, n int32) int32 {
+       return write1(fd, p, n)
+}

diff --git a/src/runtime/timestub2.go b/src/runtime/timestub2.go
index 00c2c55f461d69b50ae7a91c638039ebaf366527..95ec99e7dcc07f92fb55d6288efd985fbd0516e5 100644 (file)
--- a/src/runtime/timestub2.go
+++ b/src/runtime/timestub2.go
@@ -9,4 +9,4 @@
 
 package runtime
 
-func walltime() (sec int64, nsec int32)
+func walltime1() (sec int64, nsec int32)

diff --git a/src/runtime/vdso_freebsd.go b/src/runtime/vdso_freebsd.go
index 4e5891976dd707b78bc83d123a62007aafe83c3c..122cc8b128a0954b470a83241c0cf32d1a4e937d 100644 (file)
--- a/src/runtime/vdso_freebsd.go
+++ b/src/runtime/vdso_freebsd.go
@@ -97,7 +97,7 @@ func fallback_nanotime() int64
 func fallback_walltime() (sec int64, nsec int32)
 
 //go:nosplit
-func nanotime() int64 {
+func nanotime1() int64 {
        bt := vdsoClockGettime(_CLOCK_MONOTONIC)
        if bt == zeroBintime {
                return fallback_nanotime()
@@ -105,7 +105,7 @@ func nanotime() int64 {
        return int64((1e9 * uint64(bt.sec)) + ((1e9 * uint64(bt.frac>>32)) >> 32))
 }
 
-func walltime() (sec int64, nsec int32) {
+func walltime1() (sec int64, nsec int32) {
        bt := vdsoClockGettime(_CLOCK_REALTIME)
        if bt == zeroBintime {
                return fallback_walltime()