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/sys_windows_386.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/sys_windows_386.s')
| -rw-r--r-- | src/runtime/sys_windows_386.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/runtime/sys_windows_386.s b/src/runtime/sys_windows_386.s index 4628efb6a0..2793e52216 100644 --- a/src/runtime/sys_windows_386.s +++ b/src/runtime/sys_windows_386.s @@ -107,7 +107,7 @@ TEXT runtime·sigtramp(SB),NOSPLIT,$0-0 MOVL g_m(DX), BX MOVL m_g0(BX), BX CMPL DX, BX - JEQ sigtramp_g0 + JEQ g0 // switch to the g0 stack get_tls(BP) @@ -124,7 +124,7 @@ TEXT runtime·sigtramp(SB),NOSPLIT,$0-0 MOVL SP, 36(DI) MOVL DI, SP -sigtramp_g0: +g0: MOVL 0(CX), BX // ExceptionRecord* MOVL 4(CX), CX // Context* MOVL BX, 0(SP) @@ -384,12 +384,12 @@ TEXT runtime·usleep1(SB),NOSPLIT,$0 MOVL m_g0(BP), SI CMPL g(CX), SI - JNE usleep1_switch + JNE switch // executing on m->g0 already CALL AX - JMP usleep1_ret + JMP ret -usleep1_switch: +switch: // Switch to m->g0 stack and back. MOVL (g_sched+gobuf_sp)(SI), SI MOVL SP, -4(SI) @@ -397,7 +397,7 @@ usleep1_switch: CALL AX MOVL 0(SP), SP -usleep1_ret: +ret: get_tls(CX) MOVL g(CX), BP MOVL g_m(BP), BP |