diff options
| author | Keith Randall <khr@golang.org> | 2014-09-25 08:37:04 -0700 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2014-09-25 08:37:04 -0700 |
| commit | 1aa65fe8d4c0ebdd754480d281f378fcd1c42cea (patch) | |
| tree | cab6f8401df399a5768c5fd079161f57c0204c9a /src/runtime/asm_arm.s | |
| parent | 1b6807bb069c528447270c3d6c66c5c7597f388f (diff) | |
| download | go-1aa65fe8d4c0ebdd754480d281f378fcd1c42cea.tar.xz | |
runtime: add load_g call in arm callback.
Need to restore the g register. Somehow this line vaporized from
CL 144130043. Also cgo_topofstack -> _cgo_topofstack, that vaporized also.
TBR=rsc
CC=golang-codereviews
https://golang.org/cl/150940044
Diffstat (limited to 'src/runtime/asm_arm.s')
| -rw-r--r-- | src/runtime/asm_arm.s | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s index 2c5de8afb1..06bd0751db 100644 --- a/src/runtime/asm_arm.s +++ b/src/runtime/asm_arm.s @@ -1303,7 +1303,8 @@ yieldloop: // Called from cgo wrappers, this function returns g->m->curg.stack.hi. // Must obey the gcc calling convention. -TEXT cgo_topofstack(SB),NOSPLIT,$0 +TEXT _cgo_topofstack(SB),NOSPLIT,$0 + BL runtime·load_g(SB) MOVW g_m(g), R0 MOVW m_curg(R0), R0 MOVW (g_stack+stack_hi)(R0), R0 |