cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 23:53:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

runtime: fix nanotime for macOS Sierra

Browse Source 
This is a cherry-pick of https://go-review.googlesource.com/24812
to the release-branch-go1.4

In the beta version of the macOS Sierra (10.12) release, the
gettimeofday system call changed on x86. Previously it always returned
the time in the AX/DX registers. Now, if AX is returned as 0, it means
that the system call has stored the values into the memory pointed to by
the first argument, just as the libc gettimeofday function does. The
libc function handles both cases, and we need to do so as well.

Fixes #16272.

Change-Id: I490ed0a82e251fce73becc4722cbe276feebc7b7
Reviewed-on: https://go-review.googlesource.com/31729
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Josh Bleecher Snyder 2016-07-07 16:41:29 -07:00
parent f8c06b1f70
commit c26cf5cc1a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/runtime/sys_darwin_386.s
View File

@ -187,6 +187,11 @@ systime:
MOVL $0, 8(SP) // time zone pointer MOVL $0, 8(SP) // time zone pointer
MOVL $116, AX MOVL $116, AX
INT $0x80 INT $0x80
CMPL AX, $0
JNE inreg
MOVL 12(SP), AX
MOVL 16(SP), DX
inreg:
// sec is in AX, usec in DX // sec is in AX, usec in DX
// convert to DX:AX nsec // convert to DX:AX nsec
MOVL DX, BX MOVL DX, BX

7
src/runtime/sys_darwin_amd64.s
View File

@ -141,10 +141,15 @@ timeloop:
systime: systime:
// Fall back to system call (usually first call in this thread). // Fall back to system call (usually first call in this thread).
MOVQ SP, DI // must be non-nil, unused MOVQ SP, DI
MOVQ $0, SI MOVQ $0, SI
MOVL $(0x2000000+116), AX MOVL $(0x2000000+116), AX
SYSCALL SYSCALL
CMPQ AX, $0
JNE inreg
MOVQ 0(SP), AX
MOVL 8(SP), DX
inreg:
// sec is in AX, usec in DX // sec is in AX, usec in DX
// return nsec in AX // return nsec in AX
IMULQ $1000000000, AX IMULQ $1000000000, AX