From 02b5c34a1753ed935818a6da13a6db2fc1ec18a1 Mon Sep 17 00:00:00 2001 From: Virgil Date: Fri, 3 Apr 2026 19:46:09 +0000 Subject: [PATCH] feat(cgo): extend Call to support eighteen arguments Co-Authored-By: Virgil --- call_test.go | 10 +++++- call_test_support.go | 16 +++++++++ string_conversion.go | 81 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 105 insertions(+), 2 deletions(-) diff --git a/call_test.go b/call_test.go index 58ae5d8..aa6923b 100644 --- a/call_test.go +++ b/call_test.go @@ -82,7 +82,7 @@ func TestCallRejectsUnsupportedInputs(t *testing.T) { }) assertPanics(t, "unsupported argument count", func() { - _ = Call(callFailureFunction(), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18) + _ = Call(callFailureFunction(), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19) }) } @@ -126,6 +126,14 @@ func TestCallSupportsSeventeenArguments(t *testing.T) { } } +func TestCallSupportsEighteenArguments(t *testing.T) { + t.Parallel() + + if err := Call(callEighteenArgumentFunction(), 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27); err != nil { + t.Fatalf("expected success, got error: %v", err) + } +} + func TestCallSupportsSixArguments(t *testing.T) { t.Parallel() diff --git a/call_test_support.go b/call_test_support.go index 215d256..e38fa3c 100644 --- a/call_test_support.go +++ b/call_test_support.go @@ -78,6 +78,13 @@ int call_seventeen_args(uintptr_t a0, uintptr_t a1, uintptr_t a2, uintptr_t a3, return 13; } +int call_eighteen_args(uintptr_t a0, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9, uintptr_t a10, uintptr_t a11, uintptr_t a12, uintptr_t a13, uintptr_t a14, uintptr_t a15, uintptr_t a16, uintptr_t a17) { + if (a0 == 10 && a1 == 11 && a2 == 12 && a3 == 13 && a4 == 14 && a5 == 15 && a6 == 16 && a7 == 17 && a8 == 18 && a9 == 19 && a10 == 20 && a11 == 21 && a12 == 22 && a13 == 23 && a14 == 24 && a15 == 25 && a16 == 26 && a17 == 27) { + return 0; + } + return 13; +} + int call_buffer_argument(uintptr_t value) { return value == 0 ? 13 : 0; } @@ -145,6 +152,10 @@ uintptr_t call_seventeen_args_ptr(void) { return (uintptr_t)&call_seventeen_args; } +uintptr_t call_eighteen_args_ptr(void) { + return (uintptr_t)&call_eighteen_args; +} + uintptr_t call_buffer_argument_ptr(void) { return (uintptr_t)&call_buffer_argument; } @@ -225,6 +236,11 @@ func callSeventeenArgumentFunction() unsafe.Pointer { return *(*unsafe.Pointer)(unsafe.Pointer(&function)) } +func callEighteenArgumentFunction() unsafe.Pointer { + function := C.call_eighteen_args_ptr() + return *(*unsafe.Pointer)(unsafe.Pointer(&function)) +} + func callBufferArgumentFunction() unsafe.Pointer { function := C.call_buffer_argument_ptr() return *(*unsafe.Pointer)(unsafe.Pointer(&function)) diff --git a/string_conversion.go b/string_conversion.go index cd89577..39515df 100644 --- a/string_conversion.go +++ b/string_conversion.go @@ -22,6 +22,7 @@ typedef int (*cgo_call_int_fn14_t)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, u typedef int (*cgo_call_int_fn15_t)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t); typedef int (*cgo_call_int_fn16_t)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t); typedef int (*cgo_call_int_fn17_t)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t); +typedef int (*cgo_call_int_fn18_t)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t); int cgo_call_0(uintptr_t fn) { return ((cgo_call_int_fn0_t)fn)(); @@ -95,6 +96,10 @@ int cgo_call_17(uintptr_t fn, uintptr_t a0, uintptr_t a1, uintptr_t a2, uintptr_ return ((cgo_call_int_fn17_t)fn)(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } +int cgo_call_18(uintptr_t fn, uintptr_t a0, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9, uintptr_t a10, uintptr_t a11, uintptr_t a12, uintptr_t a13, uintptr_t a14, uintptr_t a15, uintptr_t a16, uintptr_t a17) { + return ((cgo_call_int_fn18_t)fn)(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); +} + */ import "C" @@ -806,8 +811,82 @@ func Call(function unsafe.Pointer, args ...interface{}) error { panic("cgo.Call: unsupported argument type") } result = C.cgo_call_17(C.uintptr_t(target), C.uintptr_t(a0), C.uintptr_t(a1), C.uintptr_t(a2), C.uintptr_t(a3), C.uintptr_t(a4), C.uintptr_t(a5), C.uintptr_t(a6), C.uintptr_t(a7), C.uintptr_t(a8), C.uintptr_t(a9), C.uintptr_t(a10), C.uintptr_t(a11), C.uintptr_t(a12), C.uintptr_t(a13), C.uintptr_t(a14), C.uintptr_t(a15), C.uintptr_t(a16)) + case 18: + a0, ok := toSyscallArg(args[0]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a1, ok := toSyscallArg(args[1]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a2, ok := toSyscallArg(args[2]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a3, ok := toSyscallArg(args[3]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a4, ok := toSyscallArg(args[4]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a5, ok := toSyscallArg(args[5]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a6, ok := toSyscallArg(args[6]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a7, ok := toSyscallArg(args[7]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a8, ok := toSyscallArg(args[8]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a9, ok := toSyscallArg(args[9]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a10, ok := toSyscallArg(args[10]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a11, ok := toSyscallArg(args[11]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a12, ok := toSyscallArg(args[12]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a13, ok := toSyscallArg(args[13]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a14, ok := toSyscallArg(args[14]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a15, ok := toSyscallArg(args[15]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a16, ok := toSyscallArg(args[16]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + a17, ok := toSyscallArg(args[17]) + if !ok { + panic("cgo.Call: unsupported argument type") + } + result = C.cgo_call_18(C.uintptr_t(target), C.uintptr_t(a0), C.uintptr_t(a1), C.uintptr_t(a2), C.uintptr_t(a3), C.uintptr_t(a4), C.uintptr_t(a5), C.uintptr_t(a6), C.uintptr_t(a7), C.uintptr_t(a8), C.uintptr_t(a9), C.uintptr_t(a10), C.uintptr_t(a11), C.uintptr_t(a12), C.uintptr_t(a13), C.uintptr_t(a14), C.uintptr_t(a15), C.uintptr_t(a16), C.uintptr_t(a17)) default: - panic("cgo.Call: unsupported argument count: max 17") + panic("cgo.Call: unsupported argument count: max 18") } if result != 0 { -- 2.45.3