qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-27 03:11:19 -07:00
Code Releases Activity

runtime: fix restoring PC in ARM version of cgocallback_gofunc

Browse Source 
Fixes #15856.

Change-Id: Ia8def161642087e4bd92a87298c77a0f9f83dc86
Reviewed-on: https://go-review.googlesource.com/23586
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
This commit is contained in:
Ian Lance Taylor 2016-05-31 14:07:38 -07:00
parent 3d037cfaf8
commit 690de51ffa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/asm_arm.s
View File

@ -626,7 +626,7 @@ havem:
BL runtime·cgocallbackg(SB) BL runtime·cgocallbackg(SB)
// Restore g->sched (== m->curg->sched) from saved values. // Restore g->sched (== m->curg->sched) from saved values.
MOVW 4(R13), R5 MOVW 0(R13), R5
MOVW R5, (g_sched+gobuf_pc)(g) MOVW R5, (g_sched+gobuf_pc)(g)
MOVW $12(R13), R4 MOVW $12(R13), R4
MOVW R4, (g_sched+gobuf_sp)(g) MOVW R4, (g_sched+gobuf_sp)(g)