runtime: fix cgocallback_gofunc argument passing on arm64

Change-Id: I4b34bcd5cde71ecfbb352b39c4231de6168cc7f3
Reviewed-on: https://go-review.googlesource.com/22651
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Michael Munday <munday@ca.ibm.com>

diff --git a/src/runtime/asm_arm64.s b/src/runtime/asm_arm64.s
index 4a18db80c3eff67f074f8f826bcd5b50b37145a2..7ebd7bacb94172add279b42cb6403a59ef30593a 100644 (file)
--- a/src/runtime/asm_arm64.s
+++ b/src/runtime/asm_arm64.s
@@ -648,10 +648,10 @@ havem:
        BL      runtime·save_g(SB)
        MOVD    (g_sched+gobuf_sp)(g), R4 // prepare stack as R4
        MOVD    (g_sched+gobuf_pc)(g), R5
-       MOVD    R5, -(16+8)(R4)
+       MOVD    R5, -(24+8)(R4)
        MOVD    ctxt+24(FP), R0
-       MOVD    R0, -(24+8)(R4) // maintain 16-byte SP alignment
-       MOVD    $-(24+8)(R4), R0
+       MOVD    R0, -(16+8)(R4)
+       MOVD    $-(24+8)(R4), R0 // maintain 16-byte SP alignment
        MOVD    R0, RSP
        BL      runtime·cgocallbackg(SB)