diff options
| author | Andrew Gerrand <adg@golang.org> | 2012-09-22 05:54:59 +1000 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2012-09-22 05:54:59 +1000 |
| commit | 7f2163954d1bf6f1621739bb931b39a34ceabdfa (patch) | |
| tree | 498eb18d36a1c37c857c5b3c4a730fc19170a1b0 | |
| parent | e26dc4a8d8c3aa3db09d90bd386a7b3cdae024f2 (diff) | |
| download | go-7f2163954d1bf6f1621739bb931b39a34ceabdfa.tar.gz go-7f2163954d1bf6f1621739bb931b39a34ceabdfa.zip | |
[release-branch.go1] runtime: increase stack frame during cgo call on windows/amd64
| -rw-r--r-- | misc/cgo/test/cgo_test.go | 1 | ||||
| -rw-r--r-- | misc/cgo/test/issue3945.go | 22 | ||||
| -rw-r--r-- | src/pkg/runtime/asm_amd64.s | 12 |
3 files changed, 30 insertions, 5 deletions
diff --git a/misc/cgo/test/cgo_test.go b/misc/cgo/test/cgo_test.go index 72673bbd80..67b54f04e5 100644 --- a/misc/cgo/test/cgo_test.go +++ b/misc/cgo/test/cgo_test.go @@ -28,5 +28,6 @@ func TestParallelSleep(t *testing.T) { testParallelSleep(t) } func TestSetEnv(t *testing.T) { testSetEnv(t) } func TestHelpers(t *testing.T) { testHelpers(t) } func Test1635(t *testing.T) { test1635(t) } +func TestPrintf(t *testing.T) { testPrintf(t) } func BenchmarkCgoCall(b *testing.B) { benchCgoCall(b) } diff --git a/misc/cgo/test/issue3945.go b/misc/cgo/test/issue3945.go new file mode 100644 index 0000000000..331cd0baf5 --- /dev/null +++ b/misc/cgo/test/issue3945.go @@ -0,0 +1,22 @@ +// Copyright 2012 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package cgotest + +// Test that cgo reserves enough stack space during cgo call. +// See http://golang.org/issue/3945 for details. + +// #include <stdio.h> +// +// void say() { +// printf("%s from C\n", "hello"); +// } +// +import "C" + +import "testing" + +func testPrintf(t *testing.T) { + C.say() +} diff --git a/src/pkg/runtime/asm_amd64.s b/src/pkg/runtime/asm_amd64.s index d41ab96d02..2bf9f7eb9f 100644 --- a/src/pkg/runtime/asm_amd64.s +++ b/src/pkg/runtime/asm_amd64.s @@ -446,19 +446,21 @@ TEXT runtime·asmcgocall(SB),7,$0 MOVQ (g_sched+gobuf_sp)(SI), SP // Now on a scheduling stack (a pthread-created stack). - SUBQ $48, SP + // Make sure we have enough room for 4 stack-backed fast-call + // registers as per windows amd64 calling convention. + SUBQ $64, SP ANDQ $~15, SP // alignment for gcc ABI - MOVQ DI, 32(SP) // save g - MOVQ DX, 24(SP) // save SP + MOVQ DI, 48(SP) // save g + MOVQ DX, 40(SP) // save SP MOVQ BX, DI // DI = first argument in AMD64 ABI MOVQ BX, CX // CX = first argument in Win64 CALL AX // Restore registers, g, stack pointer. get_tls(CX) - MOVQ 32(SP), DI + MOVQ 48(SP), DI MOVQ DI, g(CX) - MOVQ 24(SP), SP + MOVQ 40(SP), SP RET // cgocallback(void (*fn)(void*), void *frame, uintptr framesize) |