diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-14 12:10:52 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-14 12:10:52 -0500 |
| commit | 3e804631d905162d9e0fc1eba63bce6f95965a24 (patch) | |
| tree | 5a3c5fe864320ef097c2cd8808620d15a1c21913 /src/runtime/race_amd64.s | |
| parent | 9ad6b7e322deaf72e3c373952249dd078d6bd30e (diff) | |
| parent | 743bdf612a63d631bac88a6b857094152ac33d5c (diff) | |
| download | go-3e804631d905162d9e0fc1eba63bce6f95965a24.tar.gz go-3e804631d905162d9e0fc1eba63bce6f95965a24.zip | |
[dev.cc] all: merge dev.power64 (7667e41f3ced) into dev.cc
This is to reduce the delta between dev.cc and dev.garbage to just garbage collector changes.
These are the files that had merge conflicts and have been edited by hand:
malloc.go
mem_linux.go
mgc.go
os1_linux.go
proc1.go
panic1.go
runtime1.go
LGTM=austin
R=austin
CC=golang-codereviews
https://golang.org/cl/174180043
Diffstat (limited to 'src/runtime/race_amd64.s')
| -rw-r--r-- | src/runtime/race_amd64.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/runtime/race_amd64.s b/src/runtime/race_amd64.s index 429591b551..a7f44870a8 100644 --- a/src/runtime/race_amd64.s +++ b/src/runtime/race_amd64.s @@ -141,20 +141,20 @@ TEXT racecalladdr<>(SB), NOSPLIT, $0-0 MOVQ g_racectx(R14), RARG0 // goroutine context // Check that addr is within [arenastart, arenaend) or within [noptrdata, enoptrbss). CMPQ RARG1, runtime·racearenastart(SB) - JB racecalladdr_data + JB data CMPQ RARG1, runtime·racearenaend(SB) - JB racecalladdr_call -racecalladdr_data: + JB call +data: MOVQ $runtime·noptrdata(SB), R13 CMPQ RARG1, R13 - JB racecalladdr_ret + JB ret MOVQ $runtime·enoptrbss(SB), R13 CMPQ RARG1, R13 - JAE racecalladdr_ret -racecalladdr_call: + JAE ret +call: MOVQ AX, AX // w/o this 6a miscompiles this function JMP racecall<>(SB) -racecalladdr_ret: +ret: RET // func runtime·racefuncenter(pc uintptr) @@ -336,9 +336,9 @@ TEXT racecall<>(SB), NOSPLIT, $0-0 MOVQ SP, R12 // callee-saved, preserved across the CALL MOVQ m_g0(R13), R10 CMPQ R10, R14 - JE racecall_cont // already on g0 + JE call // already on g0 MOVQ (g_sched+gobuf_sp)(R10), SP -racecall_cont: +call: ANDQ $~15, SP // alignment for gcc ABI CALL AX MOVQ R12, SP |