purego: make callbacks with more than 6 arguments work properly on amd64 (#33)

3 files · +20 -13

M objc/objc_runtime_darwin_test.go +4 -4


@@ -43,13 +43,13 @@ func ExampleClass_AddIvar() {
43	43		}
44	44
45	45		func ExampleIMP() {
46		-	imp := objc.NewIMP(func(self objc.ID, _cmd objc.SEL) {
47		-	fmt.Println("IMP:", self, _cmd)
	46	+	imp := objc.NewIMP(func(self objc.ID, _cmd objc.SEL, a3, a4, a5, a6, a7, a8, a9 int) {
	47	+	fmt.Println("IMP:", self, _cmd, a3, a4, a5, a6, a7, a8, a9)
48	48		})
49	49
50		-	purego.SyscallN(uintptr(imp), 105, 567)
	50	+	purego.SyscallN(uintptr(imp), 105, 567, 9, 2, 3, ^uintptr(4), 4, 8, 9)
51	51
52		-	// Output: IMP: 105 567
	52	+	// Output: IMP: 105 567 9 2 3 -5 4 8 9
53	53		}
54	54
55	55		func ExampleID_SendSuper() {


@@ -43,13 +43,13 @@ func ExampleClass_AddIvar() {
43		}	43		}
44			44
45		func ExampleIMP() {	45		func ExampleIMP() {
46	-	imp := objc.NewIMP(func(self objc.ID, _cmd objc.SEL) {	46	+	imp := objc.NewIMP(func(self objc.ID, _cmd objc.SEL, a3, a4, a5, a6, a7, a8, a9 int) {
47	-	fmt.Println("IMP:", self, _cmd)	47	+	fmt.Println("IMP:", self, _cmd, a3, a4, a5, a6, a7, a8, a9)
48		})	48		})
49			49
50	-	purego.SyscallN(uintptr(imp), 105, 567)	50	+	purego.SyscallN(uintptr(imp), 105, 567, 9, 2, 3, ^uintptr(4), 4, 8, 9)
51			51
52	-	// Output: IMP: 105 567	52	+	// Output: IMP: 105 567 9 2 3 -5 4 8 9
53		}	53		}
54			54
55		func ExampleID_SendSuper() {	55		func ExampleID_SendSuper() {

M sys_darwin_amd64.s +15 -8


@@ -88,16 +88,19 @@ TEXT callbackasm1(SB), NOSPLIT, $0
88	88		MOVQ 0(SP), AX
89	89		ADDQ $8, SP
90	90
	91	+	MOVQ 0(SP), R12 // get the return SP so that we can align register args with stack args
	92	+
91	93		// make space for first six arguments below the frame
92		-	// TODO: check to make sure that arguments 7 and above are right after these six
93	94		ADJSP $6*8, SP
94		-	MOVQ DI, 0(SP)
95		-	MOVQ SI, 8(SP)
96		-	MOVQ DX, 16(SP)
97		-	MOVQ CX, 24(SP)
98		-	MOVQ R8, 32(SP)
99		-	MOVQ R9, 40(SP)
100		-	LEAQ (SP), R8 // R8 = address of args vector
	95	+	MOVQ DI, 8(SP)
	96	+	MOVQ SI, 16(SP)
	97	+	MOVQ DX, 24(SP)
	98	+	MOVQ CX, 32(SP)
	99	+	MOVQ R8, 40(SP)
	100	+	MOVQ R9, 48(SP)
	101	+	LEAQ 8(SP), R8 // R8 = address of args vector
	102	+
	103	+	MOVQ R12, 0(SP) // push the stack pointer below registers
101	104
102	105		// determine index into runtime·cbs table
103	106		MOVQ $callbackasm(SB), DX

@@ -132,6 +135,10 @@ TEXT callbackasm1(SB), NOSPLIT, $0
132	135
133	136		POP_REGS_HOST_TO_ABI0()
134	137
	138	+	MOVQ 0(SP), R12 // get the SP back
	139	+
135	140		ADJSP $-6*8, SP // remove arguments
136	141
	142	+	MOVQ R12, 0(SP)
	143	+
137	144		RET

 	MOVQ 0(SP), AX
 	ADDQ $8, SP
+	MOVQ 0(SP), R12 // get the return SP so that we can align register args with stack args
 	// make space for first six arguments below the frame
-	// TODO: check to make sure that arguments 7 and above are right after these six
 	ADJSP $6*8, SP
-	MOVQ  DI, 0(SP)
+	MOVQ  DI, 8(SP)
-	MOVQ  SI, 8(SP)
+	MOVQ  SI, 16(SP)
-	MOVQ  DX, 16(SP)
+	MOVQ  DX, 24(SP)
-	MOVQ  CX, 24(SP)
+	MOVQ  CX, 32(SP)
-	MOVQ  R8, 32(SP)
+	MOVQ  R8, 40(SP)
-	MOVQ  R9, 40(SP)
+	MOVQ  R9, 48(SP)
-	LEAQ  (SP), R8   // R8 = address of args vector
+	LEAQ  8(SP), R8  // R8 = address of args vector
+	MOVQ R12, 0(SP) // push the stack pointer below registers
 	// determine index into runtime·cbs table
 	MOVQ $callbackasm(SB), DX
 	POP_REGS_HOST_TO_ABI0()
+	MOVQ 0(SP), R12 // get the SP back
 	ADJSP $-6*8, SP // remove arguments
+	MOVQ R12, 0(SP)
 	RET

M sys_darwin_arm64.s +1 -1


@@ -77,7 +77,7 @@ TEXT callbackWrapInternal<>(SB), NOSPLIT, $0-0
77	77		TEXT callbackasm1(SB), NOSPLIT, $208-0
78	78		NO_LOCAL_POINTERS
79	79
80		-	// On entry, the trampoline in zcallback_windows_arm64.s left
	80	+	// On entry, the trampoline in zcallback_darwin_arm64.s left
81	81		// the callback index in R12 (which is volatile in the C ABI).
82	82
83	83		// Save callback register arguments R0-R7.


@@ -77,7 +77,7 @@ TEXT callbackWrapInternal<>(SB), NOSPLIT, $0-0
77		TEXT callbackasm1(SB), NOSPLIT, $208-0	77		TEXT callbackasm1(SB), NOSPLIT, $208-0
78		NO_LOCAL_POINTERS	78		NO_LOCAL_POINTERS
79			79
80	-	// On entry, the trampoline in zcallback_windows_arm64.s left	80	+	// On entry, the trampoline in zcallback_darwin_arm64.s left
81		// the callback index in R12 (which is volatile in the C ABI).	81		// the callback index in R12 (which is volatile in the C ABI).
82			82
83		// Save callback register arguments R0-R7.	83		// Save callback register arguments R0-R7.